From gerrit-no-reply at lists.osmocom.org Wed Aug 1 08:13:57 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 1 Aug 2018 08:13:57 +0000 Subject: Change in osmo-gsm-manuals[master]: mgw: Add new VTY reference In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/10278 ) Change subject: mgw: Add new VTY reference ...................................................................... mgw: Add new VTY reference Change-Id: Ic8ca983f3358aae9362fb21ff3a111f9c4f3935b --- M OsmoMGW/vty/mgw_vty_reference.xml 1 file changed, 15 insertions(+), 106 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoMGW/vty/mgw_vty_reference.xml b/OsmoMGW/vty/mgw_vty_reference.xml index 5bb8e19..f11f484 100644 --- a/OsmoMGW/vty/mgw_vty_reference.xml +++ b/OsmoMGW/vty/mgw_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -192,15 +186,6 @@ - - - - - - - - - @@ -306,6 +291,12 @@ + + + + + + @@ -366,12 +357,6 @@ - - - - - - @@ -486,15 +471,6 @@ - - - - - - - - - @@ -600,6 +576,12 @@ + + + + + + @@ -1110,27 +1092,12 @@ - - - - - - - - - + - - - - - - - - - + + @@ -1140,13 +1107,6 @@ - - - - - - - @@ -1174,13 +1134,6 @@ - - - - - - - @@ -1225,14 +1178,6 @@ - - - - - - - - @@ -1249,24 +1194,6 @@ - - - - - - - - - - - - - - - - - - @@ -1483,24 +1410,6 @@ - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/10278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic8ca983f3358aae9362fb21ff3a111f9c4f3935b Gerrit-Change-Number: 10278 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 09:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Aug 2018 09:30:03 +0000 Subject: Change in osmo-bsc[master]: gscon: use BSS-common payload types on BSS side In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/10173 ) Change subject: gscon: use BSS-common payload types on BSS side ...................................................................... Abandoned This needs to be re-done because the architecture in osmo-bsc has changed to much that it makes more sense to submit the changes as a new patch. -- To view, visit https://gerrit.osmocom.org/10173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I3373876bf5430130c6509be08b5f08e724c57c7a Gerrit-Change-Number: 10173 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:00:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Aug 2018 10:00:49 +0000 Subject: Change in osmo-bsc[master]: endpoint_fsm: add missing return in mgcp_pick_codec Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10286 Change subject: endpoint_fsm: add missing return in mgcp_pick_codec ...................................................................... endpoint_fsm: add missing return in mgcp_pick_codec The function mgcp_pick_codec is responsible to set the codec information. In cases whee the codec type can not be determined correctly it sets verb_info->codecs_len = 0, indicating to the caller that no codocs are set. However, after that it does not return, it sets an invalid codec anyway. - Add missing return to keep the no-codec setting in case of error. Change-Id: I8d1f8553357b6ad328ab1e5d4525fad0dd282a42 --- M src/osmo-bsc/mgw_endpoint_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/10286/1 diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c index ba10f5c..18e9dcf 100644 --- a/src/osmo-bsc/mgw_endpoint_fsm.c +++ b/src/osmo-bsc/mgw_endpoint_fsm.c @@ -739,6 +739,7 @@ "Unable to determine MGCP codec type for %s in chan-mode %s\n", gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->tch_mode)); verb_info->codecs_len = 0; + return; } verb_info->codecs[0] = codec; -- To view, visit https://gerrit.osmocom.org/10286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8d1f8553357b6ad328ab1e5d4525fad0dd282a42 Gerrit-Change-Number: 10286 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:00:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Aug 2018 10:00:50 +0000 Subject: Change in osmo-bsc[master]: gscon: use BSS-common payload types on BSS side Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10287 Change subject: gscon: use BSS-common payload types on BSS side ...................................................................... gscon: use BSS-common payload types on BSS side In cases where a codec has no fixed (IANA) payload type number, a dynamically coosen payload type number is used. For the route between BSC and MSC 3GPP as designated certain payload type numbers. However, beond that, those payload type numbers may not necessarly apply. The RTP communication between BTS and BSC still might run on a completely different payload type number. libosmo-netif contains a header file which payload type numbers shall be used. Lets use those in order to signal the same payload type numbers as we actually use in the RTP packets to the MGW. Change-Id: I507a1b1446c8f140b2950d73cf737797604c1ac3 Related: OS#2728 Related: OS#3384 --- M include/osmocom/bsc/mgw_endpoint_fsm.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/mgw_endpoint_fsm.c M src/osmo-bsc/osmo_bsc_lcls.c 5 files changed, 37 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/10287/1 diff --git a/include/osmocom/bsc/mgw_endpoint_fsm.h b/include/osmocom/bsc/mgw_endpoint_fsm.h index 34fdcb7..e264a3c 100644 --- a/include/osmocom/bsc/mgw_endpoint_fsm.h +++ b/include/osmocom/bsc/mgw_endpoint_fsm.h @@ -56,4 +56,4 @@ const char *mgcp_conn_peer_name(const struct mgcp_conn_peer *info); enum mgcp_codecs chan_mode_to_mgcp_codec(enum gsm48_chan_mode chan_mode, bool full_rate); -void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan); +void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side); diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index fd3c293..81fe9f6 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -491,7 +491,7 @@ .call_id = conn->sccp.conn_id, .ptime = 20, }; - mgcp_pick_codec(&mgw_info, for_lchan); + mgcp_pick_codec(&mgw_info, for_lchan, false); rc = osmo_strlcpy(mgw_info.addr, addr, sizeof(mgw_info.addr)); if (rc <= 0 || rc >= sizeof(mgw_info.addr)) { diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index f7efc1b..2cc9a78 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -157,7 +157,7 @@ if (lchan->conn) crcx_info.call_id = lchan->conn->sccp.conn_id; crcx_info.ptime = 20; - mgcp_pick_codec(&crcx_info, lchan); + mgcp_pick_codec(&crcx_info, lchan, true); mgw_endpoint_ci_request(lchan->mgw_endpoint_ci_bts, MGCP_VERB_CRCX, &crcx_info, fi, LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE, LCHAN_RTP_EV_MGW_ENDPOINT_ERROR, @@ -406,7 +406,7 @@ .port = to_lchan->abis_ip.bound_port, .ptime = 20, }; - mgcp_pick_codec(&mdcx_info, to_lchan); + mgcp_pick_codec(&mdcx_info, to_lchan, true); addr.s_addr = ntohl(to_lchan->abis_ip.bound_ip); addr_str = inet_ntoa(addr); diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c index 18e9dcf..fc49886 100644 --- a/src/osmo-bsc/mgw_endpoint_fsm.c +++ b/src/osmo-bsc/mgw_endpoint_fsm.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -730,10 +731,31 @@ } } -void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan) +int chan_mode_to_mgcp_bss_pt(enum mgcp_codecs codec) +{ + switch (codec) { + case CODEC_GSMHR_8000_1: + return RTP_PT_GSM_HALF; + + case CODEC_GSMEFR_8000_1: + return RTP_PT_GSM_EFR; + + case CODEC_AMR_8000_1: + return RTP_PT_AMR; + + default: + /* Not an error, we just leave it to libosmo-mgcp-client to + * decide over the PT. */ + return -1; + } +} + +void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side) { enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->tch_mode, lchan->type == GSM_LCHAN_TCH_H? false : true); + int custom_pt; + if (codec < 0) { LOG_LCHAN(lchan, LOGL_ERROR, "Unable to determine MGCP codec type for %s in chan-mode %s\n", @@ -744,4 +766,12 @@ verb_info->codecs[0] = codec; verb_info->codecs_len = 1; + + /* Setup custom payload types (only for BSS side and when required) */ + custom_pt = chan_mode_to_mgcp_bss_pt(codec); + if (bss_side && custom_pt > 0) { + verb_info->ptmap[0].codec = codec; + verb_info->ptmap[0].pt = custom_pt; + verb_info->ptmap_len = 1; + } } diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 0482661..4639c4e 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -242,7 +242,7 @@ .port = conn->user_plane.msc_assigned_rtp_port, }; osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr)); - mgcp_pick_codec(&mdcx_info, conn->lchan); + mgcp_pick_codec(&mdcx_info, conn->lchan, false); mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, &mdcx_info, @@ -573,7 +573,7 @@ mdcx_info = *other_mgw_info; /* Make sure the request doesn't want to use the other side's endpoint string. */ mdcx_info.endpoint[0] = 0; - mgcp_pick_codec(&mdcx_info, conn->lchan); + mgcp_pick_codec(&mdcx_info, conn->lchan, false); mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, &mdcx_info, NULL, 0, 0, NULL); -- To view, visit https://gerrit.osmocom.org/10287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I507a1b1446c8f140b2950d73cf737797604c1ac3 Gerrit-Change-Number: 10287 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:16:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 10:16:21 +0000 Subject: Change in osmo-bsc[master]: endpoint_fsm: add missing return in mgcp_pick_codec In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10286 ) Change subject: endpoint_fsm: add missing return in mgcp_pick_codec ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d1f8553357b6ad328ab1e5d4525fad0dd282a42 Gerrit-Change-Number: 10286 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 01 Aug 2018 10:16:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:16:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 10:16:24 +0000 Subject: Change in osmo-bsc[master]: endpoint_fsm: add missing return in mgcp_pick_codec In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10286 ) Change subject: endpoint_fsm: add missing return in mgcp_pick_codec ...................................................................... endpoint_fsm: add missing return in mgcp_pick_codec The function mgcp_pick_codec is responsible to set the codec information. In cases whee the codec type can not be determined correctly it sets verb_info->codecs_len = 0, indicating to the caller that no codocs are set. However, after that it does not return, it sets an invalid codec anyway. - Add missing return to keep the no-codec setting in case of error. Change-Id: I8d1f8553357b6ad328ab1e5d4525fad0dd282a42 --- M src/osmo-bsc/mgw_endpoint_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c index ba10f5c..18e9dcf 100644 --- a/src/osmo-bsc/mgw_endpoint_fsm.c +++ b/src/osmo-bsc/mgw_endpoint_fsm.c @@ -739,6 +739,7 @@ "Unable to determine MGCP codec type for %s in chan-mode %s\n", gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->tch_mode)); verb_info->codecs_len = 0; + return; } verb_info->codecs[0] = codec; -- To view, visit https://gerrit.osmocom.org/10286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8d1f8553357b6ad328ab1e5d4525fad0dd282a42 Gerrit-Change-Number: 10286 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:17:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 10:17:14 +0000 Subject: Change in osmo-bsc[master]: gscon: use BSS-common payload types on BSS side In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10287 ) Change subject: gscon: use BSS-common payload types on BSS side ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I507a1b1446c8f140b2950d73cf737797604c1ac3 Gerrit-Change-Number: 10287 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 01 Aug 2018 10:17:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:17:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 10:17:15 +0000 Subject: Change in osmo-bsc[master]: gscon: use BSS-common payload types on BSS side In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10287 ) Change subject: gscon: use BSS-common payload types on BSS side ...................................................................... gscon: use BSS-common payload types on BSS side In cases where a codec has no fixed (IANA) payload type number, a dynamically coosen payload type number is used. For the route between BSC and MSC 3GPP as designated certain payload type numbers. However, beond that, those payload type numbers may not necessarly apply. The RTP communication between BTS and BSC still might run on a completely different payload type number. libosmo-netif contains a header file which payload type numbers shall be used. Lets use those in order to signal the same payload type numbers as we actually use in the RTP packets to the MGW. Change-Id: I507a1b1446c8f140b2950d73cf737797604c1ac3 Related: OS#2728 Related: OS#3384 --- M include/osmocom/bsc/mgw_endpoint_fsm.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/mgw_endpoint_fsm.c M src/osmo-bsc/osmo_bsc_lcls.c 5 files changed, 37 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/mgw_endpoint_fsm.h b/include/osmocom/bsc/mgw_endpoint_fsm.h index 34fdcb7..e264a3c 100644 --- a/include/osmocom/bsc/mgw_endpoint_fsm.h +++ b/include/osmocom/bsc/mgw_endpoint_fsm.h @@ -56,4 +56,4 @@ const char *mgcp_conn_peer_name(const struct mgcp_conn_peer *info); enum mgcp_codecs chan_mode_to_mgcp_codec(enum gsm48_chan_mode chan_mode, bool full_rate); -void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan); +void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side); diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index fd3c293..81fe9f6 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -491,7 +491,7 @@ .call_id = conn->sccp.conn_id, .ptime = 20, }; - mgcp_pick_codec(&mgw_info, for_lchan); + mgcp_pick_codec(&mgw_info, for_lchan, false); rc = osmo_strlcpy(mgw_info.addr, addr, sizeof(mgw_info.addr)); if (rc <= 0 || rc >= sizeof(mgw_info.addr)) { diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index f7efc1b..2cc9a78 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -157,7 +157,7 @@ if (lchan->conn) crcx_info.call_id = lchan->conn->sccp.conn_id; crcx_info.ptime = 20; - mgcp_pick_codec(&crcx_info, lchan); + mgcp_pick_codec(&crcx_info, lchan, true); mgw_endpoint_ci_request(lchan->mgw_endpoint_ci_bts, MGCP_VERB_CRCX, &crcx_info, fi, LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE, LCHAN_RTP_EV_MGW_ENDPOINT_ERROR, @@ -406,7 +406,7 @@ .port = to_lchan->abis_ip.bound_port, .ptime = 20, }; - mgcp_pick_codec(&mdcx_info, to_lchan); + mgcp_pick_codec(&mdcx_info, to_lchan, true); addr.s_addr = ntohl(to_lchan->abis_ip.bound_ip); addr_str = inet_ntoa(addr); diff --git a/src/osmo-bsc/mgw_endpoint_fsm.c b/src/osmo-bsc/mgw_endpoint_fsm.c index 18e9dcf..fc49886 100644 --- a/src/osmo-bsc/mgw_endpoint_fsm.c +++ b/src/osmo-bsc/mgw_endpoint_fsm.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -730,10 +731,31 @@ } } -void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan) +int chan_mode_to_mgcp_bss_pt(enum mgcp_codecs codec) +{ + switch (codec) { + case CODEC_GSMHR_8000_1: + return RTP_PT_GSM_HALF; + + case CODEC_GSMEFR_8000_1: + return RTP_PT_GSM_EFR; + + case CODEC_AMR_8000_1: + return RTP_PT_AMR; + + default: + /* Not an error, we just leave it to libosmo-mgcp-client to + * decide over the PT. */ + return -1; + } +} + +void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side) { enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->tch_mode, lchan->type == GSM_LCHAN_TCH_H? false : true); + int custom_pt; + if (codec < 0) { LOG_LCHAN(lchan, LOGL_ERROR, "Unable to determine MGCP codec type for %s in chan-mode %s\n", @@ -744,4 +766,12 @@ verb_info->codecs[0] = codec; verb_info->codecs_len = 1; + + /* Setup custom payload types (only for BSS side and when required) */ + custom_pt = chan_mode_to_mgcp_bss_pt(codec); + if (bss_side && custom_pt > 0) { + verb_info->ptmap[0].codec = codec; + verb_info->ptmap[0].pt = custom_pt; + verb_info->ptmap_len = 1; + } } diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 0482661..4639c4e 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -242,7 +242,7 @@ .port = conn->user_plane.msc_assigned_rtp_port, }; osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr)); - mgcp_pick_codec(&mdcx_info, conn->lchan); + mgcp_pick_codec(&mdcx_info, conn->lchan, false); mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, &mdcx_info, @@ -573,7 +573,7 @@ mdcx_info = *other_mgw_info; /* Make sure the request doesn't want to use the other side's endpoint string. */ mdcx_info.endpoint[0] = 0; - mgcp_pick_codec(&mdcx_info, conn->lchan); + mgcp_pick_codec(&mdcx_info, conn->lchan, false); mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, &mdcx_info, NULL, 0, 0, NULL); -- To view, visit https://gerrit.osmocom.org/10287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I507a1b1446c8f140b2950d73cf737797604c1ac3 Gerrit-Change-Number: 10287 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:23:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 10:23:54 +0000 Subject: Change in osmo-bts[master]: fix conditions for sending fill frames during RTS IND In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10280 ) Change subject: fix conditions for sending fill frames during RTS IND ...................................................................... Patch Set 1: Code-Review+1 looks good, but I think it's a good opportunity to add some testing for those situations to BTS_Tests.ttcn -- To view, visit https://gerrit.osmocom.org/10280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibaf3ecbd0bde4f37e799d5e2f5d00dc695e0139a Gerrit-Change-Number: 10280 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 10:23:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:24:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 10:24:04 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.h: drop meaningless forward declaration In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10268 ) Change subject: hlr_ussd.h: drop meaningless forward declaration ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70a5c7c83c2356b779fb1ea7ffe07ccc1e279c22 Gerrit-Change-Number: 10268 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 01 Aug 2018 10:24:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:24:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 10:24:06 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.h: drop meaningless forward declaration In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10268 ) Change subject: hlr_ussd.h: drop meaningless forward declaration ...................................................................... hlr_ussd.h: drop meaningless forward declaration Change-Id: I70a5c7c83c2356b779fb1ea7ffe07ccc1e279c22 --- M src/hlr_ussd.h 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr_ussd.h b/src/hlr_ussd.h index a190dc6..0414924 100644 --- a/src/hlr_ussd.h +++ b/src/hlr_ussd.h @@ -4,9 +4,8 @@ #include #include -#include "gsup_server.h" -struct osmo_gsup_conn; +#include "gsup_server.h" struct hlr_ussd_route { /* g_hlr.routes */ -- To view, visit https://gerrit.osmocom.org/10268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I70a5c7c83c2356b779fb1ea7ffe07ccc1e279c22 Gerrit-Change-Number: 10268 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:54:45 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Aug 2018 10:54:45 +0000 Subject: Change in libosmocore[master]: socket: check return code of setsockopt Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10288 Change subject: socket: check return code of setsockopt ...................................................................... socket: check return code of setsockopt the return code of the last setsockopt() call in osmo_sock_init() is not checked. Since all other calls to setsockopt are checked, lets check this one as well. - check return code of setsockopt() and close the socket on failure Change-Id: I96dbccc3bcff35bf39979dbe0c44aadc8ce20c83 --- M src/socket.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/10288/1 diff --git a/src/socket.c b/src/socket.c index dc5590c..0a4e34c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -373,7 +373,14 @@ return -ENODEV; } - setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket: %s:%u: %s\n", host, port, + strerror(errno)); + close(sfd); + sfd = -1; + } rc = osmo_sock_init_tail(sfd, type, flags); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/10288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I96dbccc3bcff35bf39979dbe0c44aadc8ce20c83 Gerrit-Change-Number: 10288 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 10:54:45 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Aug 2018 10:54:45 +0000 Subject: Change in libosmocore[master]: socket: do not set SO_REUSEADDR for IPPROTO_UDP Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10289 Change subject: socket: do not set SO_REUSEADDR for IPPROTO_UDP ...................................................................... socket: do not set SO_REUSEADDR for IPPROTO_UDP When UDP is used as protocol (proto=IPPROTO_DUP), then we should not set SO_REUSEADDR in the socket option. Because if we do, we allow two processes to bind on the same UDP port. The errornous situation will be undetectable to both applications. So lets only set SO_REUSEADDR when we do not use UDP. - Add check if we use UDP, if yes do not set SO_REUSEADDR Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Related: OS#2874 --- M src/socket.c 1 file changed, 33 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/10289/1 diff --git a/src/socket.c b/src/socket.c index 0a4e34c..210dbf9 100644 --- a/src/socket.c +++ b/src/socket.c @@ -209,16 +209,20 @@ if (sfd < 0) continue; - rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, - &on, sizeof(on)); - if (rc < 0) { - LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket:" - " %s:%u: %s\n", - local_host, local_port, strerror(errno)); - close(sfd); - continue; + if (proto != IPPROTO_UDP) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket:" + " %s:%u: %s\n", + local_host, local_port, + strerror(errno)); + close(sfd); + continue; + } } + if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == -1) { LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: %s:%u: %s\n", local_host, local_port, strerror(errno)); @@ -345,15 +349,17 @@ continue; } } else { - rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, - &on, sizeof(on)); - if (rc < 0) { - LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket:" - " %s:%u: %s\n", - host, port, strerror(errno)); - close(sfd); - continue; + if (proto != IPPROTO_UDP) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket:" + " %s:%u: %s\n", + host, port, strerror(errno)); + close(sfd); + continue; + } } if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == -1) { LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket:" @@ -373,13 +379,15 @@ return -ENODEV; } - rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (rc < 0) { - LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket: %s:%u: %s\n", host, port, - strerror(errno)); - close(sfd); - sfd = -1; + if (proto != IPPROTO_UDP) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket: %s:%u: %s\n", host, + port, strerror(errno)); + close(sfd); + sfd = -1; + } } rc = osmo_sock_init_tail(sfd, type, flags); -- To view, visit https://gerrit.osmocom.org/10289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Gerrit-Change-Number: 10289 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 1 Aug 2018 11:01:34 +0000 Subject: Change in libosmocore[master]: socket: do not set SO_REUSEADDR for IPPROTO_UDP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10289 to look at the new patch set (#2). Change subject: socket: do not set SO_REUSEADDR for IPPROTO_UDP ...................................................................... socket: do not set SO_REUSEADDR for IPPROTO_UDP When UDP is used as protocol (proto=IPPROTO_DUP), then we should not set SO_REUSEADDR in the socket option. Because if we do, we allow two processes to bind on the same UDP port. The errornous situation will be undetectable to both applications. So lets only set SO_REUSEADDR when we do not use UDP. - Add check if we use UDP, if yes do not set SO_REUSEADDR Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Related: OS#3441 --- M src/socket.c 1 file changed, 33 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/10289/2 -- To view, visit https://gerrit.osmocom.org/10289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Gerrit-Change-Number: 10289 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:30:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:30:50 +0000 Subject: Change in libosmocore[master]: cosmetic: More context / naming / comment for test_idtag_parsing() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10290 Change subject: cosmetic: More context / naming / comment for test_idtag_parsing() ...................................................................... cosmetic: More context / naming / comment for test_idtag_parsing() Change-Id: I1ebeba2067549e0dd1541fa84715d44321ff3b43 --- M tests/utils/utils_test.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/90/10290/1 diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index a146190..eec13ca 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -175,7 +175,8 @@ struct tlv_parsed tvp; int rc; - static uint8_t data[] = { + /* IPA CCM IDENTITY REQUEST message: 8bit length followed by respective value */ + static uint8_t id_get_data[] = { 0x01, 0x08, 0x01, 0x07, 0x01, 0x02, @@ -188,7 +189,7 @@ 0x11, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - rc = ipa_ccm_idtag_parse_off(&tvp, data, sizeof(data), 1); + rc = ipa_ccm_idtag_parse_off(&tvp, id_get_data, sizeof(id_get_data), 1); OSMO_ASSERT(rc == 0); OSMO_ASSERT(TLVP_PRESENT(&tvp, 8)); -- To view, visit https://gerrit.osmocom.org/10290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1ebeba2067549e0dd1541fa84715d44321ff3b43 Gerrit-Change-Number: 10290 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:30:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:30:50 +0000 Subject: Change in libosmocore[master]: Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10291 Change subject: Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" ...................................................................... Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" This reverts commit 7f31c90b80c08fbfe2d84d70d397402fdb38b94c. Change-Id: Ib0188292a5c6ddbc3ec76a1a639cef1197f4f7ca --- M src/gsm/libosmogsm.map 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/10291/1 diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index bc9ed52..f168e5f 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -461,7 +461,6 @@ ipa_ccm_tlv_to_unitdata; ipa_ccm_idtag_name; ipa_ccm_idtag_parse; -ipa_ccm_idtag_parse_off; ipa_ccm_make_id_resp; ipa_ccm_make_id_resp_from_req; ipa_msg_alloc; -- To view, visit https://gerrit.osmocom.org/10291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0188292a5c6ddbc3ec76a1a639cef1197f4f7ca Gerrit-Change-Number: 10291 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:30:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:30:51 +0000 Subject: Change in libosmocore[master]: Revert "ipa: Properly parse LV stream of a ID_GET request" Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10292 Change subject: Revert "ipa: Properly parse LV stream of a ID_GET request" ...................................................................... Revert "ipa: Properly parse LV stream of a ID_GET request" This reverts commit f558ed4bb9c0f00997b8f97c2b251a574c1a64c4. It introduced a function/behavior that was not originally intended: The parse of IPA CCM ID GET (8bit length followed by 1 byte tag and variable-length payload) instead of the IPA CCM ID RESP (16bit length followed by 1 byte tag and variable-length payload). Change-Id: I0b964140a43ab39351be0d9c710b8ef2e87a5d9a --- M src/gsm/ipa.c 1 file changed, 3 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/10292/1 diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index aecde83..989e439 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -100,11 +100,6 @@ int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) { - return ipa_ccm_idtag_parse_off(dec, buf, len, 0); -} - -int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) -{ uint8_t t_len; uint8_t t_tag; uint8_t *cur = buf; @@ -116,11 +111,6 @@ t_len = *cur++; t_tag = *cur++; - if (t_len < len_offset) { - LOGP(DLMI, LOGL_ERROR, "minimal offset not included: %d < %d\n", t_len, len_offset); - return -EINVAL; - } - if (t_len > len + 1) { LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); return -EINVAL; @@ -128,11 +118,11 @@ DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); - dec->lv[t_tag].len = t_len - len_offset; + dec->lv[t_tag].len = t_len; dec->lv[t_tag].val = cur; - cur += t_len - len_offset; - len -= t_len - len_offset; + cur += t_len; + len -= t_len; } return 0; } -- To view, visit https://gerrit.osmocom.org/10292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0b964140a43ab39351be0d9c710b8ef2e87a5d9a Gerrit-Change-Number: 10292 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:31:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:31:33 +0000 Subject: Change in libosmocore[master]: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get, resp}_parse() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10293 Change subject: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() ...................................................................... Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() In the past, the function ipa_ccm_idtag_parse() was used to parse the payload of IPA CCM ID RESP packets. However, the function was based on a possible misunderstanding of the message encoding, and callers actually counted the first (upper) length nibble as part of the header and passed a pointer to the second (lower) length nibble of the first TLV into this function. As such, it was unfixable, and had to be replaced with a new function called ipa_ccm_id_resp_parse(). At the same time, we also add ipa_ccm_id_get_parse() to parse the slightly different format of the IPA CCM ID GET payload. We can never be 100% sure what is "correct", as our understanding of the protocol is entirely based on protocol analysis, without any official documentation available. This patch also introduces unit test coverage for both of the new functions. Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f --- M include/osmocom/gsm/ipa.h M src/gsm/ipa.c M src/gsm/libosmogsm.map M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 151 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/10293/1 diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h index 7e1d723..ec143d0 100644 --- a/include/osmocom/gsm/ipa.h +++ b/include/osmocom/gsm/ipa.h @@ -26,8 +26,14 @@ /* obtain the human-readable name of an IPA CCM ID TAG */ const char *ipa_ccm_idtag_name(uint8_t tag); -/* parse a buffer of ID tags into a osmocom TLV style representation */ -int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len); +int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) + OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); + +/* parse payload of IPA CCM ID GET into a osmocom TLV style representation */ +int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); + +/* parse payload of IPA CCM ID RESP into a osmocom TLV style representation */ +int ipa_ccm_id_resp_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); /* Is the TAG included in the length field? */ int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset); diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 989e439..3c7c300 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -127,6 +127,83 @@ return 0; } +/*! Parse the payload part of an IPA CCM ID GET, return \ref tlv_parsed format. + * The odd payload format of those messages is structured as follows: + * * 8bit length value (length of payload *and tag*) + * * 8bit tag value + * * optional, variable-length payload + * \param[out] dec Caller-provided/allocated output structure for parsed payload + * \param[in] buf Buffer containing the payload (excluding 1 byte msg_type) of the message + * \param[in] len Length of \a buf in octets + * \returns 0 on success; negative on error */ +int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len) +{ + uint8_t t_len; + uint8_t t_tag; + const uint8_t *cur = buf; + + memset(dec, 0, sizeof(*dec)); + + while (len >= 2) { + len -= 2; + t_len = *cur++; + t_tag = *cur++; + + if (t_len > len + 1) { + LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); + return -EINVAL; + } + + DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); + + dec->lv[t_tag].len = t_len-1; + dec->lv[t_tag].val = cur; + + cur += t_len-1; + len -= t_len-1; + } + return 0; +} + +/*! Parse the payload part of an IPA CCM ID RESP, return \ref tlv_parsed format. + * The odd payload format of those messages is structured as follows: + * * 16bit length value (length of payload *and tag*) + * * 8bit tag value + * * optional, variable-length payload + * \param[out] dec Caller-provided/allocated output structure for parsed payload + * \param[in] buf Buffer containing the payload (excluding 1 byte msg_type) of the message + * \param[in] len Length of \a buf in octets + * \returns 0 on success; negative on error */ +int ipa_ccm_id_resp_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len) +{ + uint8_t t_len; + uint8_t t_tag; + const uint8_t *cur = buf; + + memset(dec, 0, sizeof(*dec)); + + while (len >= 3) { + len -= 3; + t_len = *cur++ << 8; + t_len += *cur++; + t_tag = *cur++; + + if (t_len > len + 1) { + LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); + return -EINVAL; + } + + DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); + + dec->lv[t_tag].len = t_len-1; + dec->lv[t_tag].val = cur; + + cur += t_len-1; + len -= t_len-1; + } + return 0; +} + int ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data) { unsigned long ul; diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index f168e5f..a1d342a 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -461,6 +461,8 @@ ipa_ccm_tlv_to_unitdata; ipa_ccm_idtag_name; ipa_ccm_idtag_parse; +ipa_ccm_id_get_parse; +ipa_ccm_id_resp_parse; ipa_ccm_make_id_resp; ipa_ccm_make_id_resp_from_req; ipa_msg_alloc; diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index eec13ca..2f1e87d 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -21,6 +21,7 @@ */ #include +#include #include #include @@ -170,13 +171,65 @@ printf("rc = %d\n", rc); } -static void test_idtag_parsing(void) +static void test_ipa_ccm_id_resp_parsing(void) +{ + struct tlv_parsed tvp; + int rc; + + static const uint8_t id_resp_data[] = { + 0x00, 0x13, IPAC_IDTAG_MACADDR, + '0','0',':','0','2',':','9','5',':','0','0',':','6','2',':','9','e','\0', + 0x00, 0x11, IPAC_IDTAG_IPADDR, + '1','9','2','.','1','6','8','.','1','0','0','.','1','9','0','\0', + 0x00, 0x0a, IPAC_IDTAG_UNIT, + '1','2','3','4','/','0','/','0','\0', + 0x00, 0x02, IPAC_IDTAG_LOCATION1, + '\0', + 0x00, 0x0d, IPAC_IDTAG_LOCATION2, + 'B','T','S','_','N','B','T','1','3','1','G','\0', + 0x00, 0x0c, IPAC_IDTAG_EQUIPVERS, + '1','6','5','a','0','2','9','_','5','5','\0', + 0x00, 0x14, IPAC_IDTAG_SWVERSION, + '1','6','8','d','4','7','2','_','v','2','0','0','b','4','1','1','d','0','\0', + 0x00, 0x18, IPAC_IDTAG_UNITNAME, + 'n','b','t','s','-','0','0','-','0','2','-','9','5','-','0','0','-','6','2','-','9','E','\0', + 0x00, 0x0a, IPAC_IDTAG_SERNR, + '0','0','1','1','0','7','8','1','\0' + }; + + printf("\nTesting IPA CCM ID RESP parsing\n"); + + rc = ipa_ccm_id_resp_parse(&tvp, (uint8_t *) id_resp_data, sizeof(id_resp_data)); + OSMO_ASSERT(rc == 0); + + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_MACADDR)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_MACADDR) == 0x12); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_IPADDR)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_IPADDR) == 0x10); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_UNIT)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_UNIT) == 0x09); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_LOCATION1)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_LOCATION1) == 0x01); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_LOCATION2)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_LOCATION2) == 0x0c); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_EQUIPVERS)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_EQUIPVERS) == 0x0b); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_SWVERSION)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_EQUIPVERS) == 0x0b); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_SWVERSION) == 0x13); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_UNITNAME)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_UNITNAME) == 0x17); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_SERNR)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_SERNR) == 0x09); +} + +static void test_ipa_ccm_id_get_parsing(void) { struct tlv_parsed tvp; int rc; /* IPA CCM IDENTITY REQUEST message: 8bit length followed by respective value */ - static uint8_t id_get_data[] = { + static const uint8_t id_get_data[] = { 0x01, 0x08, 0x01, 0x07, 0x01, 0x02, @@ -189,7 +242,9 @@ 0x11, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - rc = ipa_ccm_idtag_parse_off(&tvp, id_get_data, sizeof(id_get_data), 1); + printf("\nTesting IPA CCM ID GET parsing\n"); + + rc = ipa_ccm_id_get_parse(&tvp, id_get_data, sizeof(id_get_data)); OSMO_ASSERT(rc == 0); OSMO_ASSERT(TLVP_PRESENT(&tvp, 8)); @@ -568,7 +623,8 @@ hexdump_test(); hexparse_test(); - test_idtag_parsing(); + test_ipa_ccm_id_get_parsing(); + test_ipa_ccm_id_resp_parsing(); test_is_hexstr(); bcd_test(); str_escape_test(); diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index b158bf7..abc7317 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -27,6 +27,10 @@ Hexparse with invalid char rc = -1 +Testing IPA CCM ID GET parsing + +Testing IPA CCM ID RESP parsing + ----- test_is_hexstr 0: pass str='(null)' min=0 max=10 even=0 expect=valid 1: pass str='(null)' min=1 max=10 even=0 expect=invalid -- To view, visit https://gerrit.osmocom.org/10293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f Gerrit-Change-Number: 10293 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:32:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:32:25 +0000 Subject: Change in libosmocore[master]: cosmetic: More context / naming / comment for test_idtag_parsing() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10290 ) Change subject: cosmetic: More context / naming / comment for test_idtag_parsing() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ebeba2067549e0dd1541fa84715d44321ff3b43 Gerrit-Change-Number: 10290 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 11:32:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:32:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:32:28 +0000 Subject: Change in libosmocore[master]: Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10291 ) Change subject: Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib0188292a5c6ddbc3ec76a1a639cef1197f4f7ca Gerrit-Change-Number: 10291 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 01 Aug 2018 11:32:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:32:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:32:32 +0000 Subject: Change in libosmocore[master]: Revert "ipa: Properly parse LV stream of a ID_GET request" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10292 ) Change subject: Revert "ipa: Properly parse LV stream of a ID_GET request" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0b964140a43ab39351be0d9c710b8ef2e87a5d9a Gerrit-Change-Number: 10292 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 01 Aug 2018 11:32:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:32:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:32:35 +0000 Subject: Change in libosmocore[master]: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get, resp}_parse() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10293 ) Change subject: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f Gerrit-Change-Number: 10293 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 01 Aug 2018 11:32:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:34:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:34:54 +0000 Subject: Change in libosmocore[master]: cosmetic: More context / naming / comment for test_idtag_parsing() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10290 ) Change subject: cosmetic: More context / naming / comment for test_idtag_parsing() ...................................................................... cosmetic: More context / naming / comment for test_idtag_parsing() Change-Id: I1ebeba2067549e0dd1541fa84715d44321ff3b43 --- M tests/utils/utils_test.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index a146190..eec13ca 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -175,7 +175,8 @@ struct tlv_parsed tvp; int rc; - static uint8_t data[] = { + /* IPA CCM IDENTITY REQUEST message: 8bit length followed by respective value */ + static uint8_t id_get_data[] = { 0x01, 0x08, 0x01, 0x07, 0x01, 0x02, @@ -188,7 +189,7 @@ 0x11, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - rc = ipa_ccm_idtag_parse_off(&tvp, data, sizeof(data), 1); + rc = ipa_ccm_idtag_parse_off(&tvp, id_get_data, sizeof(id_get_data), 1); OSMO_ASSERT(rc == 0); OSMO_ASSERT(TLVP_PRESENT(&tvp, 8)); -- To view, visit https://gerrit.osmocom.org/10290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1ebeba2067549e0dd1541fa84715d44321ff3b43 Gerrit-Change-Number: 10290 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:39:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:39:37 +0000 Subject: Change in libosmocore[master]: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get, resp}_parse() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10293 to look at the new patch set (#2). Change subject: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() ...................................................................... Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() In the past, the function ipa_ccm_idtag_parse() was used to parse the payload of IPA CCM ID RESP packets. However, the function was based on a possible misunderstanding of the message encoding, and callers actually counted the first (upper) length nibble as part of the header and passed a pointer to the second (lower) length nibble of the first TLV into this function. As such, it was unfixable, and had to be replaced with a new function called ipa_ccm_id_resp_parse(). At the same time, we also add ipa_ccm_id_get_parse() to parse the slightly different format of the IPA CCM ID GET payload. We can never be 100% sure what is "correct", as our understanding of the protocol is entirely based on protocol analysis, without any official documentation available. This patch also introduces unit test coverage for both of the new functions. Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" This reverts commit 7f31c90b80c08fbfe2d84d70d397402fdb38b94c. Revert "ipa: Properly parse LV stream of a ID_GET request" This reverts commit f558ed4bb9c0f00997b8f97c2b251a574c1a64c4. It introduced a function/behavior that was not originally intended: The parse of IPA CCM ID GET (8bit length followed by 1 byte tag and variable-length payload) instead of the IPA CCM ID RESP (16bit length followed by 1 byte tag and variable-length payload). Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f --- M include/osmocom/gsm/ipa.h M src/gsm/ipa.c M src/gsm/libosmogsm.map M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 151 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/10293/2 -- To view, visit https://gerrit.osmocom.org/10293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f Gerrit-Change-Number: 10293 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:40:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:40:22 +0000 Subject: Change in libosmocore[master]: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get, resp}_parse() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10293 ) Change subject: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f Gerrit-Change-Number: 10293 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 11:40:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:40:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:40:23 +0000 Subject: Change in libosmocore[master]: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get, resp}_parse() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10293 ) Change subject: Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() ...................................................................... Deprecate ipa_ccm_idtag_parse() with ipa_ccm_id_{get,resp}_parse() In the past, the function ipa_ccm_idtag_parse() was used to parse the payload of IPA CCM ID RESP packets. However, the function was based on a possible misunderstanding of the message encoding, and callers actually counted the first (upper) length nibble as part of the header and passed a pointer to the second (lower) length nibble of the first TLV into this function. As such, it was unfixable, and had to be replaced with a new function called ipa_ccm_id_resp_parse(). At the same time, we also add ipa_ccm_id_get_parse() to parse the slightly different format of the IPA CCM ID GET payload. We can never be 100% sure what is "correct", as our understanding of the protocol is entirely based on protocol analysis, without any official documentation available. This patch also introduces unit test coverage for both of the new functions. Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" This reverts commit 7f31c90b80c08fbfe2d84d70d397402fdb38b94c. Revert "ipa: Properly parse LV stream of a ID_GET request" This reverts commit f558ed4bb9c0f00997b8f97c2b251a574c1a64c4. It introduced a function/behavior that was not originally intended: The parse of IPA CCM ID GET (8bit length followed by 1 byte tag and variable-length payload) instead of the IPA CCM ID RESP (16bit length followed by 1 byte tag and variable-length payload). Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f --- M include/osmocom/gsm/ipa.h M src/gsm/ipa.c M src/gsm/libosmogsm.map M tests/utils/utils_test.c M tests/utils/utils_test.ok 5 files changed, 151 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h index 7e1d723..ec143d0 100644 --- a/include/osmocom/gsm/ipa.h +++ b/include/osmocom/gsm/ipa.h @@ -26,8 +26,14 @@ /* obtain the human-readable name of an IPA CCM ID TAG */ const char *ipa_ccm_idtag_name(uint8_t tag); -/* parse a buffer of ID tags into a osmocom TLV style representation */ -int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len); +int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) + OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); + +/* parse payload of IPA CCM ID GET into a osmocom TLV style representation */ +int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); + +/* parse payload of IPA CCM ID RESP into a osmocom TLV style representation */ +int ipa_ccm_id_resp_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); /* Is the TAG included in the length field? */ int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset); diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index aecde83..3c7c300 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -100,11 +100,6 @@ int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) { - return ipa_ccm_idtag_parse_off(dec, buf, len, 0); -} - -int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) -{ uint8_t t_len; uint8_t t_tag; uint8_t *cur = buf; @@ -116,11 +111,44 @@ t_len = *cur++; t_tag = *cur++; - if (t_len < len_offset) { - LOGP(DLMI, LOGL_ERROR, "minimal offset not included: %d < %d\n", t_len, len_offset); + if (t_len > len + 1) { + LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); return -EINVAL; } + DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); + + dec->lv[t_tag].len = t_len; + dec->lv[t_tag].val = cur; + + cur += t_len; + len -= t_len; + } + return 0; +} + +/*! Parse the payload part of an IPA CCM ID GET, return \ref tlv_parsed format. + * The odd payload format of those messages is structured as follows: + * * 8bit length value (length of payload *and tag*) + * * 8bit tag value + * * optional, variable-length payload + * \param[out] dec Caller-provided/allocated output structure for parsed payload + * \param[in] buf Buffer containing the payload (excluding 1 byte msg_type) of the message + * \param[in] len Length of \a buf in octets + * \returns 0 on success; negative on error */ +int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len) +{ + uint8_t t_len; + uint8_t t_tag; + const uint8_t *cur = buf; + + memset(dec, 0, sizeof(*dec)); + + while (len >= 2) { + len -= 2; + t_len = *cur++; + t_tag = *cur++; + if (t_len > len + 1) { LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); return -EINVAL; @@ -128,11 +156,50 @@ DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); - dec->lv[t_tag].len = t_len - len_offset; + dec->lv[t_tag].len = t_len-1; dec->lv[t_tag].val = cur; - cur += t_len - len_offset; - len -= t_len - len_offset; + cur += t_len-1; + len -= t_len-1; + } + return 0; +} + +/*! Parse the payload part of an IPA CCM ID RESP, return \ref tlv_parsed format. + * The odd payload format of those messages is structured as follows: + * * 16bit length value (length of payload *and tag*) + * * 8bit tag value + * * optional, variable-length payload + * \param[out] dec Caller-provided/allocated output structure for parsed payload + * \param[in] buf Buffer containing the payload (excluding 1 byte msg_type) of the message + * \param[in] len Length of \a buf in octets + * \returns 0 on success; negative on error */ +int ipa_ccm_id_resp_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len) +{ + uint8_t t_len; + uint8_t t_tag; + const uint8_t *cur = buf; + + memset(dec, 0, sizeof(*dec)); + + while (len >= 3) { + len -= 3; + t_len = *cur++ << 8; + t_len += *cur++; + t_tag = *cur++; + + if (t_len > len + 1) { + LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); + return -EINVAL; + } + + DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); + + dec->lv[t_tag].len = t_len-1; + dec->lv[t_tag].val = cur; + + cur += t_len-1; + len -= t_len-1; } return 0; } diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index bc9ed52..a1d342a 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -461,7 +461,8 @@ ipa_ccm_tlv_to_unitdata; ipa_ccm_idtag_name; ipa_ccm_idtag_parse; -ipa_ccm_idtag_parse_off; +ipa_ccm_id_get_parse; +ipa_ccm_id_resp_parse; ipa_ccm_make_id_resp; ipa_ccm_make_id_resp_from_req; ipa_msg_alloc; diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index eec13ca..2f1e87d 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -21,6 +21,7 @@ */ #include +#include #include #include @@ -170,13 +171,65 @@ printf("rc = %d\n", rc); } -static void test_idtag_parsing(void) +static void test_ipa_ccm_id_resp_parsing(void) +{ + struct tlv_parsed tvp; + int rc; + + static const uint8_t id_resp_data[] = { + 0x00, 0x13, IPAC_IDTAG_MACADDR, + '0','0',':','0','2',':','9','5',':','0','0',':','6','2',':','9','e','\0', + 0x00, 0x11, IPAC_IDTAG_IPADDR, + '1','9','2','.','1','6','8','.','1','0','0','.','1','9','0','\0', + 0x00, 0x0a, IPAC_IDTAG_UNIT, + '1','2','3','4','/','0','/','0','\0', + 0x00, 0x02, IPAC_IDTAG_LOCATION1, + '\0', + 0x00, 0x0d, IPAC_IDTAG_LOCATION2, + 'B','T','S','_','N','B','T','1','3','1','G','\0', + 0x00, 0x0c, IPAC_IDTAG_EQUIPVERS, + '1','6','5','a','0','2','9','_','5','5','\0', + 0x00, 0x14, IPAC_IDTAG_SWVERSION, + '1','6','8','d','4','7','2','_','v','2','0','0','b','4','1','1','d','0','\0', + 0x00, 0x18, IPAC_IDTAG_UNITNAME, + 'n','b','t','s','-','0','0','-','0','2','-','9','5','-','0','0','-','6','2','-','9','E','\0', + 0x00, 0x0a, IPAC_IDTAG_SERNR, + '0','0','1','1','0','7','8','1','\0' + }; + + printf("\nTesting IPA CCM ID RESP parsing\n"); + + rc = ipa_ccm_id_resp_parse(&tvp, (uint8_t *) id_resp_data, sizeof(id_resp_data)); + OSMO_ASSERT(rc == 0); + + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_MACADDR)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_MACADDR) == 0x12); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_IPADDR)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_IPADDR) == 0x10); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_UNIT)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_UNIT) == 0x09); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_LOCATION1)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_LOCATION1) == 0x01); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_LOCATION2)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_LOCATION2) == 0x0c); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_EQUIPVERS)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_EQUIPVERS) == 0x0b); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_SWVERSION)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_EQUIPVERS) == 0x0b); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_SWVERSION) == 0x13); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_UNITNAME)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_UNITNAME) == 0x17); + OSMO_ASSERT(TLVP_PRESENT(&tvp, IPAC_IDTAG_SERNR)); + OSMO_ASSERT(TLVP_LEN(&tvp, IPAC_IDTAG_SERNR) == 0x09); +} + +static void test_ipa_ccm_id_get_parsing(void) { struct tlv_parsed tvp; int rc; /* IPA CCM IDENTITY REQUEST message: 8bit length followed by respective value */ - static uint8_t id_get_data[] = { + static const uint8_t id_get_data[] = { 0x01, 0x08, 0x01, 0x07, 0x01, 0x02, @@ -189,7 +242,9 @@ 0x11, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - rc = ipa_ccm_idtag_parse_off(&tvp, id_get_data, sizeof(id_get_data), 1); + printf("\nTesting IPA CCM ID GET parsing\n"); + + rc = ipa_ccm_id_get_parse(&tvp, id_get_data, sizeof(id_get_data)); OSMO_ASSERT(rc == 0); OSMO_ASSERT(TLVP_PRESENT(&tvp, 8)); @@ -568,7 +623,8 @@ hexdump_test(); hexparse_test(); - test_idtag_parsing(); + test_ipa_ccm_id_get_parsing(); + test_ipa_ccm_id_resp_parsing(); test_is_hexstr(); bcd_test(); str_escape_test(); diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index b158bf7..abc7317 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -27,6 +27,10 @@ Hexparse with invalid char rc = -1 +Testing IPA CCM ID GET parsing + +Testing IPA CCM ID RESP parsing + ----- test_is_hexstr 0: pass str='(null)' min=0 max=10 even=0 expect=valid 1: pass str='(null)' min=1 max=10 even=0 expect=invalid -- To view, visit https://gerrit.osmocom.org/10293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f Gerrit-Change-Number: 10293 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:40:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:40:29 +0000 Subject: Change in libosmocore[master]: Revert "ipa: Properly parse LV stream of a ID_GET request" In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/10292 ) Change subject: Revert "ipa: Properly parse LV stream of a ID_GET request" ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I0b964140a43ab39351be0d9c710b8ef2e87a5d9a Gerrit-Change-Number: 10292 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:40:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:40:32 +0000 Subject: Change in libosmocore[master]: Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/10291 ) Change subject: Revert "ipa: Add libosmogsm.map entry for ipa_ccm_idtag_parse_off" ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib0188292a5c6ddbc3ec76a1a639cef1197f4f7ca Gerrit-Change-Number: 10291 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:40:40 +0000 Subject: Change in osmo-bsc[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10294 Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Change-Id: I7d5ab323989c13d0cc6ff05547306edb918e423f --- M src/ipaccess/ipaccess-proxy.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/10294/1 diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index aa5e7b4..a2ce633 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -458,8 +458,7 @@ case IPAC_MSGT_ID_RESP: DEBUGP(DLMI, "ID_RESP "); /* parse tags, search for Unit ID */ - ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + ipa_ccm_id_resp_parse(&tlvp, (uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); DEBUGP(DLMI, "\n"); if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { -- To view, visit https://gerrit.osmocom.org/10294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7d5ab323989c13d0cc6ff05547306edb918e423f Gerrit-Change-Number: 10294 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:40:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:40:47 +0000 Subject: Change in libosmo-abis[master]: Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10295 Change subject: Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() ...................................................................... Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Change-Id: Id4c9ff821a43a37cbacce905d44fee43d1b2c879 --- M src/input/ipa.c M src/input/ipaccess.c 2 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/95/10295/1 diff --git a/src/input/ipa.c b/src/input/ipa.c index fc1ca50..995d2c3 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -459,8 +459,7 @@ switch (msg_type) { case IPAC_MSGT_ID_RESP: - rc = ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + rc = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); if (rc < 0) { LOGIPA(conn, LOGL_ERROR, "IPA CCM RESPonse with " "malformed TLVs\n"); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 7d3845e..3d2fa44 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -119,8 +119,7 @@ case IPAC_MSGT_ID_RESP: DEBUGP(DLMI, "ID_RESP\n"); /* parse tags, search for Unit ID */ - ret = ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); DEBUGP(DLMI, "\n"); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " -- To view, visit https://gerrit.osmocom.org/10295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id4c9ff821a43a37cbacce905d44fee43d1b2c879 Gerrit-Change-Number: 10295 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:40:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:40:51 +0000 Subject: Change in libosmo-netif[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10296 Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Let's use this opportunity to remove the copy+pasted osmo_ipa_idtag_parse() function from the libosmo-netif codebase. Change-Id: I4626d247626543e032593bf226b6c233f6678562 --- M include/osmocom/netif/ipa.h M src/ipa.c 2 files changed, 1 insertion(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/96/10296/1 diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h index 0a29f01..0d1085f 100644 --- a/include/osmocom/netif/ipa.h +++ b/include/osmocom/netif/ipa.h @@ -27,7 +27,6 @@ struct tlv_parsed; int osmo_ipa_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd, int server); -int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len); int osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data); int ipaccess_send_pong(int fd); diff --git a/src/ipa.c b/src/ipa.c index 3888457..197a47f 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -130,35 +130,6 @@ return 0; } -int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) -{ - uint8_t t_len; - uint8_t t_tag; - uint8_t *cur = buf; - - memset(dec, 0, sizeof(*dec)); - - while (len >= 2) { - len -= 2; - t_len = *cur++; - t_tag = *cur++; - - if (t_len > len + 1) { - LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d\n", t_len); - return -EINVAL; - } - - DEBUGPC(DLMI, "%s='%s' ", ipaccess_idtag_name(t_tag), cur); - - dec->lv[t_tag].len = t_len; - dec->lv[t_tag].val = cur; - - cur += t_len; - len -= t_len; - } - return 0; -} - int osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data) { unsigned long ul; @@ -368,8 +339,7 @@ DEBUGP(DLINP, "ID_RESP\n"); /* parse tags, search for Unit ID */ - ret = osmo_ipa_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h + 1, msgb_l2len(msg)-1); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with malformed TLVs\n"); -- To view, visit https://gerrit.osmocom.org/10296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4626d247626543e032593bf226b6c233f6678562 Gerrit-Change-Number: 10296 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:45:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:45:09 +0000 Subject: Change in libosmo-abis[master]: Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10295 ) Change subject: Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4c9ff821a43a37cbacce905d44fee43d1b2c879 Gerrit-Change-Number: 10295 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 11:45:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:46:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:46:25 +0000 Subject: Change in libosmo-sccp[master]: Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10297 Change subject: Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Change-Id: I3c79d3bb56cc1370b9922e64d13d2d5508fd8039 --- M src/xua_asp_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/97/10297/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 93c76cb..78a4f25 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -806,7 +806,7 @@ case IPA_ASP_E_ID_RESP: /* resolve the AS based on the identity provided by peer. */ msg = data; - rc = ipa_ccm_idtag_parse(&tp, msgb_l2(msg)+2, msgb_l2len(msg)-2); + rc = ipa_ccm_id_resp_parse(&tp, msgb_l2(msg)+1, msgb_l2len(msg)-1); if (rc < 0) { LOGPFSML(fi, LOGL_ERROR, "Error %d parsing ID_RESP TLV: %s\n", rc, msgb_hexdump(msg)); -- To view, visit https://gerrit.osmocom.org/10297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3c79d3bb56cc1370b9922e64d13d2d5508fd8039 Gerrit-Change-Number: 10297 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 11:53:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 11:53:58 +0000 Subject: Change in libosmo-netif[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10296 to look at the new patch set (#2). Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Let's use this opportunity to remove the copy+pasted osmo_ipa_idtag_parse() function from the libosmo-netif codebase. Change-Id: I4626d247626543e032593bf226b6c233f6678562 --- M examples/Makefile.am M include/osmocom/netif/ipa.h M src/ipa.c 3 files changed, 3 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/96/10296/2 -- To view, visit https://gerrit.osmocom.org/10296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4626d247626543e032593bf226b6c233f6678562 Gerrit-Change-Number: 10296 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 11:55:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 11:55:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2432?= Message-ID: <540458868.26.1533124552322.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 751.73 KB...] from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC e1_config.o CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_80.o CC mncc.o CC db.o CC gsm_04_08.o CC gsm_04_14.o CC gsm_subscriber.o CC gsm_04_11.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC ussd.o CC token_auth.o CC vty_interface_layer3.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC meas_feed.o CC smpp_smsc.o CC smpp_openbsc.o CC smpp_vty.o CC smpp_utils.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC trau_upqueue.o CC rtp_proxy.o CC trau_mux.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs.o CC common_cs_vty.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC isdnsync.o CC meas_json-meas_json.o CC osmo_meas_udp2db-meas_udp2db.o CC osmo_meas_pcap2db-meas_pcap2db.o CC osmo_meas_udp2db-meas_db.o CC osmo_meas_pcap2db-meas_db.o CC smpp_mirror.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync CCLD meas_json CCLD smpp_mirror CCLD osmo-meas-pcap2db CCLD osmo-meas-udp2db CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC ipaccess-config.o CC ipaccess-firmware.o CC network_listen.o CC ipaccess-proxy.o ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-config CCLD ipaccess-proxy make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_filter.o CC bsc_ussd.o CC bsc_mgcp_utils.o CC bsc_nat.o CC bsc_nat_utils.o CC bsc_nat_vty.o CC bsc_sccp.o CC bsc_nat_ctrl.o bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ CC bsc_nat_rewrite.o bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_nat_filter.o CC bsc_nat_rewrite_trie.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' make[3]: *** [osmo-bsc_nat] Error 1 make[2]: *** [all-recursive] Error 1 Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:415: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 11:56:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 11:56:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2432?= Message-ID: <846020656.27.1533124583025.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 751.55 KB...] from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC db.o CC gsm_04_14.o CC gsm_04_80.o CC auth.o CC gsm_subscriber.o CC mncc.o CC gsm_04_11.o CC gsm_04_08.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o CC ussd.o CC vty_interface_layer3.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC meas_feed.o CC smpp_smsc.o CC smpp_vty.o CC smpp_openbsc.o CC smpp_utils.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC rtp_proxy.o CC trau_mux.o CC trau_upqueue.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_acc.o CC bsc_msg_filter.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs.o CC common_cs_vty.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC osmo_meas_udp2db-meas_udp2db.o CC meas_json-meas_json.o CC osmo_meas_udp2db-meas_db.o CC smpp_mirror.o CC isdnsync.o CC osmo_meas_pcap2db-meas_db.o CC osmo_meas_pcap2db-meas_pcap2db.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync CCLD osmo-meas-udp2db CCLD meas_json CCLD smpp_mirror CCLD osmo-meas-pcap2db CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC ipaccess-firmware.o CC network_listen.o CC ipaccess-proxy.o CC ipaccess-config.o ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-proxy CCLD ipaccess-config make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_filter.o CC bsc_mgcp_utils.o CC bsc_nat.o CC bsc_nat_utils.o CC bsc_nat_ctrl.o CC bsc_nat_vty.o CC bsc_ussd.o CC bsc_sccp.o bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_nat_rewrite.o CC bsc_nat_rewrite_trie.o CC bsc_nat_filter.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' make[3]: *** [osmo-bsc_nat] Error 1 Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:415: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 1 12:08:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 12:08:01 +0000 Subject: Change in openbsc[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10298 Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Change-Id: Id7f9a69f0921e97865db5720e5bb5e288b2f216b --- M openbsc/src/osmo-bsc/osmo_bsc_msc.c M openbsc/src/osmo-bsc_nat/bsc_nat.c 2 files changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/98/10298/1 diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index b179ff1..36273b9 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -456,9 +456,7 @@ .algo = OSMO_AUTH_ALG_MILENAGE, }; - ret = ipa_ccm_idtag_parse_off(&tvp, - inp->l2h + 1, - msgb_l2len(inp) - 1, 1); + ret = ipa_ccm_id_get_parse(&tvp, inp->l2h+1, msgb_l2len(inp)-1); if (ret < 0) { LOGP(DMSC, LOGL_ERROR, "ignoring IPA response " "message with malformed TLVs: %s\n", osmo_hexdump(inp->l2h + 1, diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 0559758..74ae430 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1291,9 +1291,7 @@ if (msg->l2h[0] == IPAC_MSGT_ID_RESP && msgb_l2len(msg) > 2) { struct tlv_parsed tvp; int ret; - ret = ipa_ccm_idtag_parse_off(&tvp, - (unsigned char *) msg->l2h + 2, - msgb_l2len(msg) - 2, 0); + ret = ipa_ccm_id_resp_parse(&tvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); if (ret < 0) { LOGP(DNAT, LOGL_ERROR, "ignoring IPA response " "message with malformed TLVs\n"); -- To view, visit https://gerrit.osmocom.org/10298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id7f9a69f0921e97865db5720e5bb5e288b2f216b Gerrit-Change-Number: 10298 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 12:08:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 12:08:52 +0000 Subject: Change in libosmo-sccp[master]: Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10297 ) Change subject: Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c79d3bb56cc1370b9922e64d13d2d5508fd8039 Gerrit-Change-Number: 10297 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 12:08:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 12:08:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 12:08:53 +0000 Subject: Change in libosmo-sccp[master]: Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10297 ) Change subject: Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from ipa_ccm_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Change-Id: I3c79d3bb56cc1370b9922e64d13d2d5508fd8039 --- M src/xua_asp_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 93c76cb..78a4f25 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -806,7 +806,7 @@ case IPA_ASP_E_ID_RESP: /* resolve the AS based on the identity provided by peer. */ msg = data; - rc = ipa_ccm_idtag_parse(&tp, msgb_l2(msg)+2, msgb_l2len(msg)-2); + rc = ipa_ccm_id_resp_parse(&tp, msgb_l2(msg)+1, msgb_l2len(msg)-1); if (rc < 0) { LOGPFSML(fi, LOGL_ERROR, "Error %d parsing ID_RESP TLV: %s\n", rc, msgb_hexdump(msg)); -- To view, visit https://gerrit.osmocom.org/10297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3c79d3bb56cc1370b9922e64d13d2d5508fd8039 Gerrit-Change-Number: 10297 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 12:08:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 12:08:58 +0000 Subject: Change in osmo-bsc[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10294 ) Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d5ab323989c13d0cc6ff05547306edb918e423f Gerrit-Change-Number: 10294 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 12:08:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 12:08:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 12:08:59 +0000 Subject: Change in osmo-bsc[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10294 ) Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Change-Id: I7d5ab323989c13d0cc6ff05547306edb918e423f --- M src/ipaccess/ipaccess-proxy.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index aa5e7b4..a2ce633 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -458,8 +458,7 @@ case IPAC_MSGT_ID_RESP: DEBUGP(DLMI, "ID_RESP "); /* parse tags, search for Unit ID */ - ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + ipa_ccm_id_resp_parse(&tlvp, (uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); DEBUGP(DLMI, "\n"); if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { -- To view, visit https://gerrit.osmocom.org/10294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7d5ab323989c13d0cc6ff05547306edb918e423f Gerrit-Change-Number: 10294 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 12:11:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 12:11:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2433?= In-Reply-To: <540458868.26.1533124552322.JavaMail.jenkins@jenkins.osmocom.org> References: <540458868.26.1533124552322.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <175926749.28.1533125485128.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 761.44 KB...] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_logic.o CC handover_decision.o CC meas_rep.o CC rest_octets.o CC system_information.o CC pcu_sock.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_80.o CC db.o CC gsm_04_08.o CC gsm_04_14.o CC gsm_04_11.o CC mncc.o CC gsm_subscriber.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o CC ussd.o CC vty_interface_layer3.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC meas_feed.o CC smpp_smsc.o CC smpp_openbsc.o CC smpp_vty.o CC smpp_utils.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC rtp_proxy.o CC trau_mux.o CC trau_upqueue.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs_vty.o CC common_cs.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC isdnsync.o CC meas_json-meas_json.o CC osmo_meas_udp2db-meas_udp2db.o CC smpp_mirror.o CC osmo_meas_pcap2db-meas_pcap2db.o CC osmo_meas_udp2db-meas_db.o CC osmo_meas_pcap2db-meas_db.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync CCLD meas_json CCLD smpp_mirror CCLD osmo-meas-udp2db CCLD osmo-meas-pcap2db CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC ipaccess-config.o CC ipaccess-firmware.o CC network_listen.o CC ipaccess-proxy.o ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-proxy CCLD ipaccess-config make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_filter.o CC bsc_nat.o CC bsc_mgcp_utils.o CC bsc_nat_utils.o CC bsc_ussd.o CC bsc_nat_ctrl.o CC bsc_sccp.o CC bsc_nat_vty.o bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_nat_rewrite.o CC bsc_nat_rewrite_trie.o CC bsc_nat_filter.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' make[3]: *** [osmo-bsc_nat] Error 1 Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:415: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 12:11:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 12:11:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2433?= In-Reply-To: <846020656.27.1533124583025.JavaMail.jenkins@jenkins.osmocom.org> References: <846020656.27.1533124583025.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <133837935.29.1533125512334.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 751.39 KB...] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC e1_config.o CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_subscriber.o CC gsm_04_80.o CC gsm_04_14.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o CC vty_interface_layer3.o CC ussd.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC meas_feed.o CC smpp_smsc.o CC smpp_openbsc.o CC smpp_vty.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ CC smpp_utils.o AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC rtp_proxy.o CC trau_mux.o CC trau_upqueue.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs.o CC common_cs_vty.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC isdnsync.o CC meas_json-meas_json.o CC osmo_meas_udp2db-meas_udp2db.o CC osmo_meas_pcap2db-meas_pcap2db.o CC osmo_meas_udp2db-meas_db.o CC osmo_meas_pcap2db-meas_db.o CC smpp_mirror.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync CCLD osmo-meas-udp2db CCLD meas_json CCLD osmo-meas-pcap2db CCLD smpp_mirror CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC ipaccess-config.o CC ipaccess-proxy.o CC ipaccess-firmware.o CC network_listen.o ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-config CCLD ipaccess-proxy make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_filter.o CC bsc_nat_utils.o CC bsc_mgcp_utils.o CC bsc_nat_vty.o CC bsc_nat.o CC bsc_sccp.o CC bsc_ussd.o CC bsc_nat_ctrl.o bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ CC bsc_nat_rewrite.o bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_nat_rewrite_trie.o CC bsc_nat_filter.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' make[3]: *** [osmo-bsc_nat] Error 1 make[2]: *** [all-recursive] Error 1 Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[1]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make: *** [all] Error 2 Makefile:415: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 1 12:20:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 12:20:54 +0000 Subject: Change in libosmocore[master]: socket: check return code of setsockopt In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10288 ) Change subject: socket: check return code of setsockopt ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96dbccc3bcff35bf39979dbe0c44aadc8ce20c83 Gerrit-Change-Number: 10288 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 01 Aug 2018 12:20:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 12:22:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 12:22:59 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2434?= In-Reply-To: <175926749.28.1533125485128.JavaMail.jenkins@jenkins.osmocom.org> References: <175926749.28.1533125485128.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <331326107.30.1533126179395.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 759.48 KB...] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_04_08.o CC gsm_subscriber.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o CC ussd.o CC vty_interface_layer3.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC meas_feed.o CC smpp_smsc.o CC smpp_openbsc.o CC smpp_vty.o CC smpp_utils.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC trau_mux.o CC rtp_proxy.o CC trau_upqueue.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_acc.o CC bsc_msg_filter.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs.o CC common_cs_vty.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC isdnsync.o CC meas_json-meas_json.o CC osmo_meas_udp2db-meas_udp2db.o CC osmo_meas_pcap2db-meas_pcap2db.o CC smpp_mirror.o CC osmo_meas_udp2db-meas_db.o CC osmo_meas_pcap2db-meas_db.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync CCLD meas_json CCLD smpp_mirror CCLD osmo-meas-pcap2db CCLD osmo-meas-udp2db CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC ipaccess-firmware.o CC ipaccess-config.o CC network_listen.o CC ipaccess-proxy.o ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-config CCLD ipaccess-proxy make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_filter.o CC bsc_mgcp_utils.o CC bsc_nat.o CC bsc_nat_utils.o CC bsc_nat_vty.o CC bsc_ussd.o CC bsc_nat_ctrl.o CC bsc_sccp.o bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_nat_rewrite.o CC bsc_nat_rewrite_trie.o CC bsc_nat_filter.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' make[3]: *** [osmo-bsc_nat] Error 1 Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:415: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 12:23:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 12:23:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2434?= In-Reply-To: <133837935.29.1533125512334.JavaMail.jenkins@jenkins.osmocom.org> References: <133837935.29.1533125512334.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1628596854.31.1533126193050.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 759.59 KB...] struct con_group *cg; ^ CC paging.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_14.o CC db.o CC gsm_04_11.o CC gsm_04_08.o CC gsm_04_80.o CC gsm_subscriber.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o CC ussd.o CC vty_interface_layer3.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC meas_feed.o CC smpp_smsc.o CC smpp_openbsc.o CC smpp_vty.o CC smpp_utils.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC trau_mux.o CC rtp_proxy.o CC trau_upqueue.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs.o CC common_cs_vty.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC isdnsync.o CC meas_json-meas_json.o CC osmo_meas_udp2db-meas_db.o CC smpp_mirror.o CC osmo_meas_pcap2db-meas_pcap2db.o CC osmo_meas_pcap2db-meas_db.o CC osmo_meas_udp2db-meas_udp2db.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync CCLD meas_json CCLD osmo-meas-udp2db CCLD smpp_mirror CCLD osmo-meas-pcap2db CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC network_listen.o CC ipaccess-config.o CC ipaccess-firmware.o CC ipaccess-proxy.o ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-config CCLD ipaccess-proxy make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_mgcp_utils.o CC bsc_filter.o CC bsc_nat.o CC bsc_nat_vty.o CC bsc_sccp.o CC bsc_nat_utils.o CC bsc_ussd.o CC bsc_nat_ctrl.o bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_nat_rewrite.o CC bsc_nat_rewrite_trie.o CC bsc_nat_filter.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_nat] Error 1 Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:415: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:34:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:34:05 +0000 Subject: Change in libosmocore[master]: re-introduce ipa_ccm_idtag_parse_off() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10299 Change subject: re-introduce ipa_ccm_idtag_parse_off() ...................................................................... re-introduce ipa_ccm_idtag_parse_off() In the previous commit we deprecated ipa_ccm_idtag_parse() but also removed ipa_ccm_idtag_parse_off(), for which I couldn't find any users. However, legacy openbsc.git still uses this function, so let's re-introiduce it in its original form. Change-Id: Ibfe53b04340eb355c8bfb8453a2af1522a4b6baf --- M include/osmocom/gsm/ipa.h M src/gsm/ipa.c M src/gsm/libosmogsm.map 3 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/10299/1 diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h index ec143d0..93cb1bf 100644 --- a/include/osmocom/gsm/ipa.h +++ b/include/osmocom/gsm/ipa.h @@ -28,6 +28,8 @@ int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); +int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) + OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); /* parse payload of IPA CCM ID GET into a osmocom TLV style representation */ int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); @@ -35,9 +37,6 @@ /* parse payload of IPA CCM ID RESP into a osmocom TLV style representation */ int ipa_ccm_id_resp_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); -/* Is the TAG included in the length field? */ -int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset); - /* parse an Unit ID in string format into the 'ipaccess_unit' data structure */ int ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data); diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 3c7c300..508cc13 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -100,6 +100,11 @@ int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) { + return ipa_ccm_idtag_parse_off(dec, buf, len, 0); +} + +int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) +{ uint8_t t_len; uint8_t t_tag; uint8_t *cur = buf; @@ -111,6 +116,11 @@ t_len = *cur++; t_tag = *cur++; + if (t_len < len_offset) { + LOGP(DLMI, LOGL_ERROR, "minimal offset not included: %d < %d\n", t_len, len_offset); + return -EINVAL; + } + if (t_len > len + 1) { LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); return -EINVAL; @@ -118,11 +128,11 @@ DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); - dec->lv[t_tag].len = t_len; + dec->lv[t_tag].len = t_len - len_offset; dec->lv[t_tag].val = cur; - cur += t_len; - len -= t_len; + cur += t_len - len_offset; + len -= t_len - len_offset; } return 0; } diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index a1d342a..2bb9d97 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -461,6 +461,7 @@ ipa_ccm_tlv_to_unitdata; ipa_ccm_idtag_name; ipa_ccm_idtag_parse; +ipa_ccm_idtag_parse_off; ipa_ccm_id_get_parse; ipa_ccm_id_resp_parse; ipa_ccm_make_id_resp; -- To view, visit https://gerrit.osmocom.org/10299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfe53b04340eb355c8bfb8453a2af1522a4b6baf Gerrit-Change-Number: 10299 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:34:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:34:42 +0000 Subject: Change in libosmocore[master]: re-introduce ipa_ccm_idtag_parse_off() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10299 ) Change subject: re-introduce ipa_ccm_idtag_parse_off() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibfe53b04340eb355c8bfb8453a2af1522a4b6baf Gerrit-Change-Number: 10299 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 15:34:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:36:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:36:27 +0000 Subject: Change in libosmo-netif[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10296 to look at the new patch set (#3). Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Let's use this opportunity to remove the copy+pasted osmo_ipa_idtag_parse() function from the libosmo-netif codebase. Change-Id: I4626d247626543e032593bf226b6c233f6678562 --- M examples/Makefile.am M include/osmocom/netif/ipa.h M src/ipa.c M tests/Makefile.am 4 files changed, 7 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/96/10296/3 -- To view, visit https://gerrit.osmocom.org/10296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4626d247626543e032593bf226b6c233f6678562 Gerrit-Change-Number: 10296 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:36:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:36:44 +0000 Subject: Change in libosmo-abis[master]: Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10295 ) Change subject: Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() ...................................................................... Migrate from ipa_ccm_idtag_parse to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Change-Id: Id4c9ff821a43a37cbacce905d44fee43d1b2c879 --- M src/input/ipa.c M src/input/ipaccess.c 2 files changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/input/ipa.c b/src/input/ipa.c index fc1ca50..995d2c3 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -459,8 +459,7 @@ switch (msg_type) { case IPAC_MSGT_ID_RESP: - rc = ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + rc = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); if (rc < 0) { LOGIPA(conn, LOGL_ERROR, "IPA CCM RESPonse with " "malformed TLVs\n"); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 7d3845e..3d2fa44 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -119,8 +119,7 @@ case IPAC_MSGT_ID_RESP: DEBUGP(DLMI, "ID_RESP\n"); /* parse tags, search for Unit ID */ - ret = ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1); DEBUGP(DLMI, "\n"); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " -- To view, visit https://gerrit.osmocom.org/10295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4c9ff821a43a37cbacce905d44fee43d1b2c879 Gerrit-Change-Number: 10295 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:46:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:46:11 +0000 Subject: Change in libosmocore[master]: jenkins_arm.sh: Use same Werror related options as on other builds Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10300 Change subject: jenkins_arm.sh: Use same Werror related options as on other builds ...................................................................... jenkins_arm.sh: Use same Werror related options as on other builds Change-Id: I45ab11b461a35923853f38b5bedd5025f53cc5b5 --- M contrib/jenkins_arm.sh 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/10300/1 diff --git a/contrib/jenkins_arm.sh b/contrib/jenkins_arm.sh index 8229fc8..1d72f2f 100755 --- a/contrib/jenkins_arm.sh +++ b/contrib/jenkins_arm.sh @@ -2,6 +2,10 @@ . $(dirname "$0")/jenkins_common.sh + +# from ../configure.ac +WERROR_FLAGS="-Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" + src_dir="$PWD" build() { build_dir="$1" @@ -14,7 +18,7 @@ --enable-embedded \ --disable-doxygen \ --disable-shared \ - CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror" + CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs $WERROR_FLAGS" $MAKE $PARALLEL_MAKE } -- To view, visit https://gerrit.osmocom.org/10300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I45ab11b461a35923853f38b5bedd5025f53cc5b5 Gerrit-Change-Number: 10300 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:46:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:46:34 +0000 Subject: Change in libosmocore[master]: jenkins_arm.sh: Use same Werror related options as on other builds In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10300 ) Change subject: jenkins_arm.sh: Use same Werror related options as on other builds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45ab11b461a35923853f38b5bedd5025f53cc5b5 Gerrit-Change-Number: 10300 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 15:46:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:46:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:46:42 +0000 Subject: Change in libosmo-netif[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10296 ) Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4626d247626543e032593bf226b6c233f6678562 Gerrit-Change-Number: 10296 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 15:46:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:46:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:46:43 +0000 Subject: Change in libosmo-netif[master]: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10296 ) Change subject: Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() ...................................................................... Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse() In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement of ipa_ccm_idtag_parse(). The main difference is that the returned "value" parts now have a correct reported "length", whereas before this commit they all reported a one-byte too-long "length" for each IE. Let's use this opportunity to remove the copy+pasted osmo_ipa_idtag_parse() function from the libosmo-netif codebase. Change-Id: I4626d247626543e032593bf226b6c233f6678562 --- M examples/Makefile.am M include/osmocom/netif/ipa.h M src/ipa.c M tests/Makefile.am 4 files changed, 7 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/examples/Makefile.am b/examples/Makefile.am index 52f4c83..4125243 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -46,10 +46,10 @@ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) rs232_read_SOURCES = rs232-read.c -rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) +rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) rs232_write_SOURCES = rs232-write.c -rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) +rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) rtp_udp_test_client_SOURCES = rtp-udp-test-client.c rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \ diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h index 0a29f01..0d1085f 100644 --- a/include/osmocom/netif/ipa.h +++ b/include/osmocom/netif/ipa.h @@ -27,7 +27,6 @@ struct tlv_parsed; int osmo_ipa_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd, int server); -int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len); int osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data); int ipaccess_send_pong(int fd); diff --git a/src/ipa.c b/src/ipa.c index 3888457..197a47f 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -130,35 +130,6 @@ return 0; } -int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) -{ - uint8_t t_len; - uint8_t t_tag; - uint8_t *cur = buf; - - memset(dec, 0, sizeof(*dec)); - - while (len >= 2) { - len -= 2; - t_len = *cur++; - t_tag = *cur++; - - if (t_len > len + 1) { - LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d\n", t_len); - return -EINVAL; - } - - DEBUGPC(DLMI, "%s='%s' ", ipaccess_idtag_name(t_tag), cur); - - dec->lv[t_tag].len = t_len; - dec->lv[t_tag].val = cur; - - cur += t_len; - len -= t_len; - } - return 0; -} - int osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data) { unsigned long ul; @@ -368,8 +339,7 @@ DEBUGP(DLINP, "ID_RESP\n"); /* parse tags, search for Unit ID */ - ret = osmo_ipa_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); + ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h + 1, msgb_l2len(msg)-1); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with malformed TLVs\n"); diff --git a/tests/Makefile.am b/tests/Makefile.am index 7c06b13..03a7a3c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,13 +5,13 @@ check_HEADERS = osmux_osmux_test_SOURCES = osmux/osmux_test.c -osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la +osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la osmux_osmux_test2_SOURCES = osmux/osmux_test2.c -osmux_osmux_test2_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la +osmux_osmux_test2_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la jibuf_jibuf_test_SOURCES = jibuf/jibuf_test.c -jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la +jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la if HAVE_PCAP check_PROGRAMS += jibuf/jibuf_tool @@ -31,6 +31,7 @@ jibuf_jibuf_tool_LDADD = \ $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ $(top_builddir)/src/libosmonetif.la \ -lpcap endif -- To view, visit https://gerrit.osmocom.org/10296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4626d247626543e032593bf226b6c233f6678562 Gerrit-Change-Number: 10296 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 15:48:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:48:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4908?= Message-ID: <637707453.32.1533138487916.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 809.13 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC mgcp_osmux.lo CC mgcp_sdp.lo CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[2]: *** [install-recursive] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:48:58 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:48:58 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2991?= Message-ID: <1817319866.33.1533138538846.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 660.08 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_sdp.lo CC mgcp_osmux.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_fsm.lo CC mgcp_client_vty.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_network.o CC mgcp_protocol.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 make[2]: *** [install-recursive] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:49:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:49:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4908?= Message-ID: <1597982399.34.1533138546468.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 717.66 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_sdp.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_osmux.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client_vty.lo CC mgcp_client.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_conn.o CC mgcp_msg.o CC mgcp_vty.o CC mgcp_codec.o CC mgcp_sdp.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:50:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:50:03 +0000 Subject: Change in libosmocore[master]: jenkins_arm.sh: Use same Werror related options as on other builds In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10300 ) Change subject: jenkins_arm.sh: Use same Werror related options as on other builds ...................................................................... jenkins_arm.sh: Use same Werror related options as on other builds Change-Id: I45ab11b461a35923853f38b5bedd5025f53cc5b5 --- M contrib/jenkins_arm.sh 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_arm.sh b/contrib/jenkins_arm.sh index 8229fc8..1d72f2f 100755 --- a/contrib/jenkins_arm.sh +++ b/contrib/jenkins_arm.sh @@ -2,6 +2,10 @@ . $(dirname "$0")/jenkins_common.sh + +# from ../configure.ac +WERROR_FLAGS="-Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" + src_dir="$PWD" build() { build_dir="$1" @@ -14,7 +18,7 @@ --enable-embedded \ --disable-doxygen \ --disable-shared \ - CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror" + CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs $WERROR_FLAGS" $MAKE $PARALLEL_MAKE } -- To view, visit https://gerrit.osmocom.org/10300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I45ab11b461a35923853f38b5bedd5025f53cc5b5 Gerrit-Change-Number: 10300 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 15:50:45 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:50:45 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2435?= In-Reply-To: <331326107.30.1533126179395.JavaMail.jenkins@jenkins.osmocom.org> References: <331326107.30.1533126179395.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1711805400.35.1533138645668.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 760.24 KB...] from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC system_information.o CC e1_config.o CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_08.o CC db.o CC gsm_04_80.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_subscriber.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o CC ussd.o CC vty_interface_layer3.o CC transaction.o CC osmo_msc.o CC ctrl_commands.o CC smpp_smsc.o CC meas_feed.o CC smpp_openbsc.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ CC smpp_vty.o CC smpp_utils.o AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC rtp_proxy.o CC trau_mux.o CC trau_upqueue.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs_vty.o CC common_cs.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC osmo_meas_pcap2db-meas_db.o CC isdnsync.o CC osmo_meas_pcap2db-meas_pcap2db.o CC meas_json-meas_json.o CC smpp_mirror.o CC osmo_meas_udp2db-meas_db.o CC osmo_meas_udp2db-meas_udp2db.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD smpp_mirror CCLD meas_json CCLD osmo-meas-pcap2db CCLD osmo-meas-udp2db CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC ipaccess-config.o CC ipaccess-firmware.o CC network_listen.o CC ipaccess-proxy.o ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-proxy CCLD ipaccess-config make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_filter.o CC bsc_mgcp_utils.o CC bsc_nat_ctrl.o CC bsc_nat.o CC bsc_sccp.o CC bsc_nat_vty.o CC bsc_nat_utils.o CC bsc_ussd.o bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ CC bsc_nat_rewrite.o CC bsc_nat_rewrite_trie.o CC bsc_nat_filter.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_nat] Error 1 Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' make[2]: *** [all-recursive] Error 1 Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[1]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make: *** [all] Error 2 Makefile:415: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:50:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:50:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2435?= In-Reply-To: <1628596854.31.1533126193050.JavaMail.jenkins@jenkins.osmocom.org> References: <1628596854.31.1533126193050.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <5068987.36.1533138648366.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 760.34 KB...] from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC system_information.o CC rest_octets.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_80_utils.o CC gsm_04_08_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_subscriber.o CC gsm_04_08.o CC gsm_04_14.o CC gsm_04_11.o CC gsm_04_80.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o CC ussd.o CC vty_interface_layer3.o CC transaction.o CC ctrl_commands.o CC osmo_msc.o CC meas_feed.o CC smpp_smsc.o CC smpp_openbsc.o CC smpp_vty.o CC smpp_utils.o smpp_openbsc.c: In function 'submit_to_sms': smpp_openbsc.c:168:2: warning: #warning Implement reply path [-Wcpp] #warning Implement reply path ^ AR libmsc.a make[3]: Leaving directory '/build/openbsc/src/libmsc' Making all in libtrau make[3]: Entering directory '/build/openbsc/src/libtrau' CC rtp_proxy.o CC trau_mux.o CC trau_upqueue.o AR libtrau.a make[3]: Leaving directory '/build/openbsc/src/libtrau' Making all in libfilter make[3]: Entering directory '/build/openbsc/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_vty.o CC bsc_msg_acc.o AR libfilter.a make[3]: Leaving directory '/build/openbsc/src/libfilter' Making all in libcommon-cs make[3]: Entering directory '/build/openbsc/src/libcommon-cs' CC common_cs.o CC common_cs_vty.o AR libcommon-cs.a make[3]: Leaving directory '/build/openbsc/src/libcommon-cs' Making all in osmo-nitb make[3]: Entering directory '/build/openbsc/src/osmo-nitb' CC bsc_hack.o bsc_hack.c: In function 'main': bsc_hack.c:268:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-nitb make[3]: Leaving directory '/build/openbsc/src/osmo-nitb' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/openbsc/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_main.c: In function 'main': mgcp_main.c:209:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD osmo-bsc_mgcp make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_mgcp' Making all in utils make[3]: Entering directory '/build/openbsc/src/utils' CC bs11_config.o CC meas_json-meas_json.o CC isdnsync.o CC smpp_mirror.o CC osmo_meas_udp2db-meas_udp2db.o CC osmo_meas_udp2db-meas_db.o CC osmo_meas_pcap2db-meas_db.o CC osmo_meas_pcap2db-meas_pcap2db.o smpp_mirror.c: In function 'main': smpp_mirror.c:339:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ bs11_config.c: In function 'main': bs11_config.c:896:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD isdnsync CCLD meas_json CCLD smpp_mirror CCLD osmo-meas-pcap2db CCLD osmo-meas-udp2db CCLD bs11_config make[3]: Leaving directory '/build/openbsc/src/utils' Making all in ipaccess make[3]: Entering directory '/build/openbsc/src/ipaccess' CC abisip-find.o CC ipaccess-firmware.o CC ipaccess-config.o CC ipaccess-proxy.o CC network_listen.o ipaccess-config.c: In function 'main': ipaccess-config.c:850:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ ipaccess-proxy.c: In function 'ipaccess_rcvmsg': ipaccess-proxy.c:457:3: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, ^ ipaccess-proxy.c: In function 'main': ipaccess-proxy.c:1210:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD abisip-find CCLD ipaccess-config CCLD ipaccess-proxy make[3]: Leaving directory '/build/openbsc/src/ipaccess' Making all in osmo-bsc_nat make[3]: Entering directory '/build/openbsc/src/osmo-bsc_nat' CC bsc_nat.o CC bsc_mgcp_utils.o CC bsc_nat_utils.o CC bsc_filter.o CC bsc_nat_vty.o CC bsc_sccp.o CC bsc_ussd.o CC bsc_nat_ctrl.o bsc_filter.c:139:1: warning: "/*" within comment [-Wcomment] /* it's blacklisted (not to be forwarded) */ ^ bsc_ussd.c: In function 'ussd_read_cb': bsc_ussd.c:144:4: warning: 'ipa_ccm_idtag_parse' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h:29): Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] ret = ipa_ccm_idtag_parse(&tvp, ^ bsc_ussd.c: In function 'bsc_ussd_check': bsc_ussd.c:431:3: warning: 'gsm0480_decode_ussd_request' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h:50): Use gsm0480_decode_ss_request() instead [-Wdeprecated-declarations] if (gsm0480_decode_ussd_request(hdr48, len, &req) != 1) ^ bsc_nat.c: In function 'main': bsc_nat.c:1621:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_nat_rewrite_trie.o CC bsc_nat_rewrite.o CC bsc_nat_filter.o CCLD osmo-bsc_nat bsc_nat.o: In function `forward_sccp_to_msc': /build/openbsc/src/osmo-bsc_nat/bsc_nat.c:1294: undefined reference to `ipa_ccm_idtag_parse_off' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_nat] Error 1 Makefile:489: recipe for target 'osmo-bsc_nat' failed make[3]: Leaving directory '/build/openbsc/src/osmo-bsc_nat' Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:415: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:52:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:52:44 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-osmo-mgw_=C2=BB_--disable-mgcp-tr?= =?UTF-8?Q?anscoding,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1229?= Message-ID: <1356280566.37.1533138764810.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 180.27 KB...] libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libosmo-legacy-mgcp/Makefile.am: installing './depcomp' + ./configure --disable-mgcp-transcoding --enable-vty-tests --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.4.0.4-6931f > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in legacy_mgcp make[4]: Entering directory '/build/include/osmocom/legacy_mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/legacy_mgcp' Making all in mgcp_client make[4]: Entering directory '/build/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make all-am make[5]: Entering directory '/build/include/osmocom/mgcp_client' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/include/osmocom/mgcp_client' Making all in mgcp make[4]: Entering directory '/build/include/osmocom/mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/mgcp' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libosmo-legacy-mgcp make[3]: Entering directory '/build/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_sdp.lo CC mgcp_osmux.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[3]: Leaving directory '/build/src/libosmo-legacy-mgcp' Making all in libosmo-mgcp-client make[3]: Entering directory '/build/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[3]: Leaving directory '/build/src/libosmo-mgcp-client' Making all in libosmo-mgcp make[3]: Entering directory '/build/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_osmux.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_codec.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[3]: Leaving directory '/build/src/libosmo-mgcp' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/src/osmo-bsc_mgcp' make[2]: *** [all-recursive] Error 1 Makefile:395: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:493: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:399: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:52:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:52:46 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmo-mgw_=C2=BB_--enable-mgcp-tr?= =?UTF-8?Q?anscoding,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1229?= Message-ID: <1433489569.38.1533138766100.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 180.66 KB...] configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libosmo-legacy-mgcp/Makefile.am: installing './depcomp' + ./configure --enable-mgcp-transcoding --enable-vty-tests --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking gsm.h usability... yes checking gsm.h presence... yes checking for gsm.h... yes checking gsm/gsm.h usability... yes checking gsm/gsm.h presence... yes checking for gsm/gsm.h... yes checking for library containing gsm_create... -lgsm checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.4.0.4-6931f > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in legacy_mgcp make[4]: Entering directory '/build/include/osmocom/legacy_mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/legacy_mgcp' Making all in mgcp_client make[4]: Entering directory '/build/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make all-am make[5]: Entering directory '/build/include/osmocom/mgcp_client' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/include/osmocom/mgcp_client' Making all in mgcp make[4]: Entering directory '/build/include/osmocom/mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/mgcp' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libosmo-legacy-mgcp make[3]: Entering directory '/build/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_osmux.lo CC mgcp_vty.lo CC mgcp_transcode.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[3]: Leaving directory '/build/src/libosmo-legacy-mgcp' Making all in libosmo-mgcp-client make[3]: Entering directory '/build/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[3]: Leaving directory '/build/src/libosmo-mgcp-client' Making all in libosmo-mgcp make[3]: Entering directory '/build/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_vty.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[3]: Leaving directory '/build/src/libosmo-mgcp' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/src/osmo-bsc_mgcp' make[2]: *** [all-recursive] Error 1 Makefile:395: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:493: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:399: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 1 15:52:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 15:52:54 +0000 Subject: Change in libosmocore[master]: re-introduce ipa_ccm_idtag_parse_off() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10299 ) Change subject: re-introduce ipa_ccm_idtag_parse_off() ...................................................................... re-introduce ipa_ccm_idtag_parse_off() In the previous commit we deprecated ipa_ccm_idtag_parse() but also removed ipa_ccm_idtag_parse_off(), for which I couldn't find any users. However, legacy openbsc.git still uses this function, so let's re-introiduce it in its original form. Change-Id: Ibfe53b04340eb355c8bfb8453a2af1522a4b6baf --- M include/osmocom/gsm/ipa.h M src/gsm/ipa.c M src/gsm/libosmogsm.map 3 files changed, 16 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h index ec143d0..93cb1bf 100644 --- a/include/osmocom/gsm/ipa.h +++ b/include/osmocom/gsm/ipa.h @@ -28,6 +28,8 @@ int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); +int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) + OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); /* parse payload of IPA CCM ID GET into a osmocom TLV style representation */ int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); @@ -35,9 +37,6 @@ /* parse payload of IPA CCM ID RESP into a osmocom TLV style representation */ int ipa_ccm_id_resp_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); -/* Is the TAG included in the length field? */ -int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset); - /* parse an Unit ID in string format into the 'ipaccess_unit' data structure */ int ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data); diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 3c7c300..508cc13 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -100,6 +100,11 @@ int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) { + return ipa_ccm_idtag_parse_off(dec, buf, len, 0); +} + +int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) +{ uint8_t t_len; uint8_t t_tag; uint8_t *cur = buf; @@ -111,6 +116,11 @@ t_len = *cur++; t_tag = *cur++; + if (t_len < len_offset) { + LOGP(DLMI, LOGL_ERROR, "minimal offset not included: %d < %d\n", t_len, len_offset); + return -EINVAL; + } + if (t_len > len + 1) { LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1); return -EINVAL; @@ -118,11 +128,11 @@ DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); - dec->lv[t_tag].len = t_len; + dec->lv[t_tag].len = t_len - len_offset; dec->lv[t_tag].val = cur; - cur += t_len; - len -= t_len; + cur += t_len - len_offset; + len -= t_len - len_offset; } return 0; } diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index a1d342a..2bb9d97 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -461,6 +461,7 @@ ipa_ccm_tlv_to_unitdata; ipa_ccm_idtag_name; ipa_ccm_idtag_parse; +ipa_ccm_idtag_parse_off; ipa_ccm_id_get_parse; ipa_ccm_id_resp_parse; ipa_ccm_make_id_resp; -- To view, visit https://gerrit.osmocom.org/10299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibfe53b04340eb355c8bfb8453a2af1522a4b6baf Gerrit-Change-Number: 10299 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 15:54:56 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:54:56 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2992?= In-Reply-To: <1817319866.33.1533138538846.JavaMail.jenkins@jenkins.osmocom.org> References: <1817319866.33.1533138538846.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <47446305.39.1533138896999.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 677.78 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_protocol.lo CC mgcp_common.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_osmux.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client_vty.lo CC mgcp_client.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_sdp.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:55:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:55:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4909?= In-Reply-To: <637707453.32.1533138487916.JavaMail.jenkins@jenkins.osmocom.org> References: <637707453.32.1533138487916.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1065580365.40.1533138907454.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 829.91 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC mgcp_osmux.lo CC mgcp_sdp.lo CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make: *** [install] Error 2 Makefile:792: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:56:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:56:44 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4909?= In-Reply-To: <1597982399.34.1533138546468.JavaMail.jenkins@jenkins.osmocom.org> References: <1597982399.34.1533138546468.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1289124652.41.1533139004706.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 738.54 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_osmux.lo CC mgcp_sdp.lo CC mgcp_network.lo CC mgcp_vty.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_osmux.o CC mgcp_network.o CC mgcp_codec.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_endp.o CC mgcp_stat.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make: *** [install] Error 2 Makefile:792: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:56:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:56:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4910?= In-Reply-To: <1065580365.40.1533138907454.JavaMail.jenkins@jenkins.osmocom.org> References: <1065580365.40.1533138907454.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1384837090.42.1533139014057.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 808.62 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_network.lo CC mgcp_protocol.lo CC mgcp_vty.lo CC mgcp_osmux.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_conn.o CC mgcp_msg.o CC mgcp_codec.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[2]: *** [install-recursive] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make: *** [install] Error 2 Makefile:792: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 15:57:01 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 15:57:01 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4910?= In-Reply-To: <1289124652.41.1533139004706.JavaMail.jenkins@jenkins.osmocom.org> References: <1289124652.41.1533139004706.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <247900082.43.1533139021244.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 717.64 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_osmux.lo CC mgcp_vty.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_fsm.lo CC mgcp_client_vty.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_sdp.o CC mgcp_protocol.o CC mgcp_network.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_codec.o CC mgcp_osmux.o CC mgcp_vty.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[2]: *** [install-recursive] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:00:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:00:04 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?enable-mgcp-transcoding,--enable-?= =?UTF-8?Q?smpp,osmocom-master-debian9_#2436?= In-Reply-To: <5068987.36.1533138648366.JavaMail.jenkins@jenkins.osmocom.org> References: <5068987.36.1533138648366.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <262823967.44.1533139204927.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Aug 1 16:00:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:00:55 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#2436?= In-Reply-To: <1711805400.35.1533138645668.JavaMail.jenkins@jenkins.osmocom.org> References: <1711805400.35.1533138645668.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1326191329.45.1533139255625.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:02:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 16:02:55 +0000 Subject: Change in libosmo-netif[master]: link libosmo-netif against libosmogsm Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10301 Change subject: link libosmo-netif against libosmogsm ...................................................................... link libosmo-netif against libosmogsm The recently-introduced dependency to libosmogsm symbols needed some explicit addition of linker flags to avoid user applications to fail linking with /usr/bin/ld: /usr/local/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' Change-Id: I07a28f8970b90f82736e2de783bafc9d2c5ea0e5 --- M src/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/01/10301/1 diff --git a/src/Makefile.am b/src/Makefile.am index d88f0a7..de7dff5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,12 +3,12 @@ LIBVERSION=6:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) +AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) lib_LTLIBRARIES = libosmonetif.la -libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) +libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ -- To view, visit https://gerrit.osmocom.org/10301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I07a28f8970b90f82736e2de783bafc9d2c5ea0e5 Gerrit-Change-Number: 10301 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 16:05:04 +0000 Subject: Change in libosmo-netif[master]: link libosmo-netif against libosmogsm In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10301 ) Change subject: link libosmo-netif against libosmogsm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07a28f8970b90f82736e2de783bafc9d2c5ea0e5 Gerrit-Change-Number: 10301 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 16:05:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 16:07:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:07:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4911?= In-Reply-To: <1384837090.42.1533139014057.JavaMail.jenkins@jenkins.osmocom.org> References: <1384837090.42.1533139014057.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1780239400.46.1533139634490.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 830.60 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC mgcp_osmux.lo CC mgcp_sdp.lo CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_network.o CC mgcp_protocol.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:07:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:07:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4911?= In-Reply-To: <247900082.43.1533139021244.JavaMail.jenkins@jenkins.osmocom.org> References: <247900082.43.1533139021244.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2083583113.47.1533139668873.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 739.23 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_sdp.lo CC mgcp_osmux.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_conn.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:08:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:08:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-osmo-mgw_=C2=BB_--disable-mgcp-tr?= =?UTF-8?Q?anscoding,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1230?= In-Reply-To: <1356280566.37.1533138764810.JavaMail.jenkins@jenkins.osmocom.org> References: <1356280566.37.1533138764810.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <324885541.48.1533139727198.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 197.78 KB...] libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libosmo-legacy-mgcp/Makefile.am: installing './depcomp' + ./configure --disable-mgcp-transcoding --enable-vty-tests --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.4.0.4-6931f > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in legacy_mgcp make[4]: Entering directory '/build/include/osmocom/legacy_mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/legacy_mgcp' Making all in mgcp_client make[4]: Entering directory '/build/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make all-am make[5]: Entering directory '/build/include/osmocom/mgcp_client' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/include/osmocom/mgcp_client' Making all in mgcp make[4]: Entering directory '/build/include/osmocom/mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/mgcp' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libosmo-legacy-mgcp make[3]: Entering directory '/build/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_osmux.lo CC mgcp_vty.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[3]: Leaving directory '/build/src/libosmo-legacy-mgcp' Making all in libosmo-mgcp-client make[3]: Entering directory '/build/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[3]: Leaving directory '/build/src/libosmo-mgcp-client' Making all in libosmo-mgcp make[3]: Entering directory '/build/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_osmux.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[3]: Leaving directory '/build/src/libosmo-mgcp' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/src/osmo-bsc_mgcp' make[2]: *** [all-recursive] Error 1 Makefile:395: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:493: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:399: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:08:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:08:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmo-mgw_=C2=BB_--enable-mgcp-tr?= =?UTF-8?Q?anscoding,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1230?= In-Reply-To: <1433489569.38.1533138766100.JavaMail.jenkins@jenkins.osmocom.org> References: <1433489569.38.1533138766100.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <949708363.49.1533139737272.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 182.06 KB...] configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libosmo-legacy-mgcp/Makefile.am: installing './depcomp' + ./configure --enable-mgcp-transcoding --enable-vty-tests --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking gsm.h usability... yes checking gsm.h presence... yes checking for gsm.h... yes checking gsm/gsm.h usability... yes checking gsm/gsm.h presence... yes checking for gsm/gsm.h... yes checking for library containing gsm_create... -lgsm checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.4.0.4-6931f > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in legacy_mgcp make[4]: Entering directory '/build/include/osmocom/legacy_mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/legacy_mgcp' Making all in mgcp_client make[4]: Entering directory '/build/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make all-am make[5]: Entering directory '/build/include/osmocom/mgcp_client' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/include/osmocom/mgcp_client' Making all in mgcp make[4]: Entering directory '/build/include/osmocom/mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/mgcp' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libosmo-legacy-mgcp make[3]: Entering directory '/build/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_transcode.lo CC mgcp_vty.lo CC mgcp_osmux.lo CC mgcp_sdp.lo CC mgcp_network.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[3]: Leaving directory '/build/src/libosmo-legacy-mgcp' Making all in libosmo-mgcp-client make[3]: Entering directory '/build/src/libosmo-mgcp-client' CC mgcp_client_vty.lo CC mgcp_client.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[3]: Leaving directory '/build/src/libosmo-mgcp-client' Making all in libosmo-mgcp make[3]: Entering directory '/build/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_conn.o CC mgcp_codec.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_msg.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[3]: Leaving directory '/build/src/libosmo-mgcp' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 make[2]: *** [all-recursive] Error 1 Makefile:395: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:493: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:399: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:09:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:09:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-osmo-mgw_=C2=BB_--disable-mgcp-tr?= =?UTF-8?Q?anscoding,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1231?= In-Reply-To: <324885541.48.1533139727198.JavaMail.jenkins@jenkins.osmocom.org> References: <324885541.48.1533139727198.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <326185670.50.1533139773830.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 181.20 KB...] libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libosmo-legacy-mgcp/Makefile.am: installing './depcomp' + ./configure --disable-mgcp-transcoding --enable-vty-tests --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.4.0.4-6931f > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in legacy_mgcp make[4]: Entering directory '/build/include/osmocom/legacy_mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/legacy_mgcp' Making all in mgcp_client make[4]: Entering directory '/build/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make all-am make[5]: Entering directory '/build/include/osmocom/mgcp_client' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/include/osmocom/mgcp_client' Making all in mgcp make[4]: Entering directory '/build/include/osmocom/mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/mgcp' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libosmo-legacy-mgcp make[3]: Entering directory '/build/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_vty.lo CC mgcp_network.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC mgcp_osmux.lo CC mgcp_sdp.lo CCLD libosmo-legacy-mgcp.la make[3]: Leaving directory '/build/src/libosmo-legacy-mgcp' Making all in libosmo-mgcp-client make[3]: Entering directory '/build/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[3]: Leaving directory '/build/src/libosmo-mgcp-client' Making all in libosmo-mgcp make[3]: Entering directory '/build/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[3]: Leaving directory '/build/src/libosmo-mgcp' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/src/osmo-bsc_mgcp' Makefile:395: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:493: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:399: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:09:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:09:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_mast?= =?UTF-8?Q?er-osmo-mgw_=C2=BB_--enable-mgcp-tr?= =?UTF-8?Q?anscoding,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1231?= In-Reply-To: <949708363.49.1533139737272.JavaMail.jenkins@jenkins.osmocom.org> References: <949708363.49.1533139737272.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1702671108.51.1533139797948.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 197.19 KB...] configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libosmo-legacy-mgcp/Makefile.am: installing './depcomp' + ./configure --enable-mgcp-transcoding --enable-vty-tests --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking gsm.h usability... yes checking gsm.h presence... yes checking for gsm.h... yes checking gsm/gsm.h usability... yes checking gsm/gsm.h presence... yes checking for gsm/gsm.h... yes checking for library containing gsm_create... -lgsm checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.4.0.4-6931f > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in legacy_mgcp make[4]: Entering directory '/build/include/osmocom/legacy_mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/legacy_mgcp' Making all in mgcp_client make[4]: Entering directory '/build/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make all-am make[5]: Entering directory '/build/include/osmocom/mgcp_client' make[5]: Nothing to be done for 'all-am'. make[5]: Leaving directory '/build/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/include/osmocom/mgcp_client' Making all in mgcp make[4]: Entering directory '/build/include/osmocom/mgcp' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/mgcp' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libosmo-legacy-mgcp make[3]: Entering directory '/build/src/libosmo-legacy-mgcp' CC mgcp_protocol.lo CC mgcp_common.lo CC mgcp_transcode.lo CC mgcp_sdp.lo CC mgcp_vty.lo CC mgcp_network.lo CC mgcp_osmux.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[3]: Leaving directory '/build/src/libosmo-legacy-mgcp' Making all in libosmo-mgcp-client make[3]: Entering directory '/build/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[3]: Leaving directory '/build/src/libosmo-mgcp-client' Making all in libosmo-mgcp make[3]: Entering directory '/build/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_osmux.o CC mgcp_conn.o CC mgcp_msg.o CC mgcp_codec.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[3]: Leaving directory '/build/src/libosmo-mgcp' Making all in osmo-bsc_mgcp make[3]: Entering directory '/build/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/src/osmo-bsc_mgcp' make[2]: *** [all-recursive] Error 1 Makefile:395: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:493: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:399: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:11:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:11:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2993?= In-Reply-To: <47446305.39.1533138896999.JavaMail.jenkins@jenkins.osmocom.org> References: <47446305.39.1533138896999.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1385720260.52.1533139914863.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 660.02 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_osmux.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_osmux.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_protocol.o CC mgcp_conn.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 make[2]: *** [install-recursive] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:792: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:12:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:12:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4912?= In-Reply-To: <2083583113.47.1533139668873.JavaMail.jenkins@jenkins.osmocom.org> References: <2083583113.47.1533139668873.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1225839578.53.1533139920749.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 739.66 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_vty.lo CC mgcp_network.lo CC mgcp_osmux.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client_vty.lo CC mgcp_client.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_codec.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_vty.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:12:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:12:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4912?= In-Reply-To: <1780239400.46.1533139634490.JavaMail.jenkins@jenkins.osmocom.org> References: <1780239400.46.1533139634490.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1520113322.54.1533139926216.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 830.58 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_network.lo CC mgcp_protocol.lo CC mgcp_vty.lo CC mgcp_osmux.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client_fsm.lo CC mgcp_client.lo CC mgcp_client_vty.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_network.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_msg.o CC mgcp_codec.o CC mgcp_osmux.o CC mgcp_protocol.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 make[2]: *** [install-recursive] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 1 Aug 2018 16:15:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Don't try to send packets while MDCX is underway Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10302 Change subject: mgw: Don't try to send packets while MDCX is underway ...................................................................... mgw: Don't try to send packets while MDCX is underway TC_two_crcx_and_one_mdcx_rtp_ho sometimes failed while trying to send an RTP packet without a connected port. f_flow_modify re-bind()s the port, sends the MDCX and then connect()s it after the MDCX ACK returned the IP/port combination. If the transmit timer fires off between the bind and connect the resulting send call will fail. Change-Id: Idf93ceb830a44dafa56430ab5178f05da6bdd6fb --- M mgw/MGCP_Test.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/10302/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 494e8bb..e1ebc26 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1258,7 +1258,9 @@ /* Now switch the flow over to a new port (BTS) */ port_old := flow[0].em.portnr; flow[0].em.portnr := 10002; + f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); /* When handing over a call, the old source may still keep * transmitting for a while. We simulate this by injecting -- To view, visit https://gerrit.osmocom.org/10302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idf93ceb830a44dafa56430ab5178f05da6bdd6fb Gerrit-Change-Number: 10302 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 16:15:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:15:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4913?= In-Reply-To: <1520113322.54.1533139926216.JavaMail.jenkins@jenkins.osmocom.org> References: <1520113322.54.1533139926216.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <978124204.55.1533140116625.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 807.30 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_osmux.lo CC mgcp_sdp.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_msg.o CC mgcp_network.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:15:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:15:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4913?= In-Reply-To: <1225839578.53.1533139920749.JavaMail.jenkins@jenkins.osmocom.org> References: <1225839578.53.1533139920749.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <585522739.56.1533140120142.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 716.17 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_protocol.lo CC mgcp_common.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_sdp.lo CC mgcp_osmux.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_fsm.lo CC mgcp_client_vty.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_codec.o CC mgcp_osmux.o CC mgcp_msg.o CC mgcp_sdp.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' Makefile:792: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:15:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:15:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2994?= In-Reply-To: <1385720260.52.1533139914863.JavaMail.jenkins@jenkins.osmocom.org> References: <1385720260.52.1533139914863.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1747706119.57.1533140155099.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 677.57 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_protocol.lo CC mgcp_common.lo CC mgcp_network.lo CC mgcp_sdp.lo CC mgcp_osmux.lo CC mgcp_vty.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_network.o CC mgcp_codec.o CC mgcp_osmux.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_protocol.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:792: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:19:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:19:14 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4914?= In-Reply-To: <978124204.55.1533140116625.JavaMail.jenkins@jenkins.osmocom.org> References: <978124204.55.1533140116625.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1373599941.58.1533140354273.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 831.68 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_protocol.lo CC mgcp_network.lo CC mgcp_vty.lo CC mgcp_common.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC mgcp_osmux.lo CC mgcp_sdp.lo CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_fsm.lo CC mgcp_client_vty.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_codec.o CC mgcp_msg.o CC mgcp_conn.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make: *** [install] Error 2 Makefile:792: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 1 16:20:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:20:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4914?= In-Reply-To: <585522739.56.1533140120142.JavaMail.jenkins@jenkins.osmocom.org> References: <585522739.56.1533140120142.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1921381202.59.1533140408159.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 740.31 KB...] checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOVTY... yes checking for LIBOSMONETIF... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether to enable VTY/CTRL tests... no CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmo-legacy-mgcp.pc config.status: creating libosmo-mgcp-client.pc config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/legacy_mgcp/Makefile config.status: creating include/osmocom/mgcp_client/Makefile config.status: creating include/osmocom/mgcp/Makefile config.status: creating src/Makefile config.status: creating src/libosmo-legacy-mgcp/Makefile config.status: creating src/libosmo-mgcp-client/Makefile config.status: creating src/libosmo-mgcp/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/osmo-mgw/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/legacy_mgcp/Makefile config.status: creating tests/mgcp_client/Makefile config.status: creating tests/mgcp/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 1.4.0.4-6931f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/osmo-mgw' Making install in doc make[2]: Entering directory '/build/deps/osmo-mgw/doc' Making install in examples make[3]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Entering directory '/build/deps/osmo-mgw/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. make install-data-hook make[5]: Entering directory '/build/deps/osmo-mgw/doc/examples' for f in $(find . -name '*.cfg*' | sed -e 's,^.,,'); do \ j="/build/deps/install/stow/osmo-mgw/share/doc/osmo-mgw/examples/$f" && \ mkdir -p "$(dirname $j)" && \ /usr/bin/install -c -m 644 ./$f $j; \ done make[5]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[4]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Leaving directory '/build/deps/osmo-mgw/doc/examples' make[3]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Entering directory '/build/deps/osmo-mgw/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/doc' make[3]: Leaving directory '/build/deps/osmo-mgw/doc' make[2]: Leaving directory '/build/deps/osmo-mgw/doc' Making install in include make[2]: Entering directory '/build/deps/osmo-mgw/include' Making install in osmocom make[3]: Entering directory '/build/deps/osmo-mgw/include/osmocom' Making install in legacy_mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/legacy_mgcp' Making install in mgcp_client make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' echo -e "/*\n\n DO NOT EDIT THIS FILE!\n THIS IS OVERWRITTEN DURING BUILD\n This is an automatic copy of \n\n */" > mgcp_common.h cat ../../../include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h make install-am make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[6]: Nothing to be done for 'install-exec-am'. make[6]: Nothing to be done for 'install-data-am'. make[6]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp_client' Making install in mgcp make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom/mgcp' make[4]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Entering directory '/build/deps/osmo-mgw/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[4]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Leaving directory '/build/deps/osmo-mgw/include/osmocom' make[3]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Entering directory '/build/deps/osmo-mgw/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /usr/bin/install -c -m 644 osmocom/mgcp_client/mgcp_client.h osmocom/mgcp_client/mgcp_client_fsm.h osmocom/mgcp_client/mgcp_common.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp_client' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /usr/bin/install -c -m 644 osmocom/mgcp/mgcp.h osmocom/mgcp/mgcp_common.h osmocom/mgcp/mgcp_internal.h osmocom/mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/mgcp' /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' /usr/bin/install -c -m 644 osmocom/legacy_mgcp/mgcp.h osmocom/legacy_mgcp/mgcp_internal.h osmocom/legacy_mgcp/osmux.h '/build/deps/install/stow/osmo-mgw/include/osmocom/legacy_mgcp' make[4]: Leaving directory '/build/deps/osmo-mgw/include' make[3]: Leaving directory '/build/deps/osmo-mgw/include' make[2]: Leaving directory '/build/deps/osmo-mgw/include' Making install in src make[2]: Entering directory '/build/deps/osmo-mgw/src' Making install in libosmo-legacy-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' CC mgcp_common.lo CC mgcp_osmux.lo CC mgcp_sdp.lo CC mgcp_network.lo CC mgcp_protocol.lo CC mgcp_vty.lo mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:765:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CCLD libosmo-legacy-mgcp.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-legacy-mgcp.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.so.0.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.so.0.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0 || { rm -f libosmo-legacy-mgcp.so.0 && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so.0; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so || { rm -f libosmo-legacy-mgcp.so && ln -s libosmo-legacy-mgcp.so.0.1.0 libosmo-legacy-mgcp.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.la libtool: install: /usr/bin/install -c .libs/libosmo-legacy-mgcp.a /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-legacy-mgcp.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-legacy-mgcp' Making install in libosmo-mgcp-client make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' CC mgcp_client.lo CC mgcp_client_vty.lo CC mgcp_client_fsm.lo CCLD libosmo-mgcp-client.la make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/osmo-mgw/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmo-mgcp-client.la '/build/deps/install/stow/osmo-mgw/lib' libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.so.3.1.0 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.so.3.1.0 libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3 || { rm -f libosmo-mgcp-client.so.3 && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so.3; }; }) libtool: install: (cd /build/deps/install/stow/osmo-mgw/lib && { ln -s -f libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so || { rm -f libosmo-mgcp-client.so && ln -s libosmo-mgcp-client.so.3.1.0 libosmo-mgcp-client.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.lai /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.la libtool: install: /usr/bin/install -c .libs/libosmo-mgcp-client.a /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: chmod 644 /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: install: ranlib /build/deps/install/stow/osmo-mgw/lib/libosmo-mgcp-client.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/osmo-mgw/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/osmo-mgw/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp-client' Making install in libosmo-mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' CC mgcp_msg.o CC mgcp_codec.o CC mgcp_conn.o CC mgcp_sdp.o CC mgcp_osmux.o CC mgcp_vty.o CC mgcp_network.o CC mgcp_protocol.o CC mgcp_stat.o CC mgcp_endp.o AR libosmo-mgcp.a make[4]: Entering directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' make[3]: Leaving directory '/build/deps/osmo-mgw/src/libosmo-mgcp' Making install in osmo-bsc_mgcp make[3]: Entering directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' CC mgcp_main.o mgcp_main.c:62:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CCLD osmo-bsc_mgcp /build/deps/install/stow/libosmo-netif/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' collect2: error: ld returned 1 exit status Makefile:430: recipe for target 'osmo-bsc_mgcp' failed make[3]: Leaving directory '/build/deps/osmo-mgw/src/osmo-bsc_mgcp' make[3]: *** [osmo-bsc_mgcp] Error 1 Makefile:395: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/osmo-mgw/src' make[2]: *** [install-recursive] Error 1 Makefile:493: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-mgw' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:792: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:22:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 16:22:23 +0000 Subject: Change in libosmo-netif[master]: link libosmo-netif against libosmogsm In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10301 ) Change subject: link libosmo-netif against libosmogsm ...................................................................... link libosmo-netif against libosmogsm The recently-introduced dependency to libosmogsm symbols needed some explicit addition of linker flags to avoid user applications to fail linking with /usr/bin/ld: /usr/local/lib/libosmonetif.so: undefined reference to `ipa_ccm_id_resp_parse' Change-Id: I07a28f8970b90f82736e2de783bafc9d2c5ea0e5 --- M src/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index d88f0a7..de7dff5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,12 +3,12 @@ LIBVERSION=6:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) +AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) lib_LTLIBRARIES = libosmonetif.la -libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) +libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ -- To view, visit https://gerrit.osmocom.org/10301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I07a28f8970b90f82736e2de783bafc9d2c5ea0e5 Gerrit-Change-Number: 10301 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:22:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 16:22:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Don't try to send packets while MDCX is underway In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10302 ) Change subject: mgw: Don't try to send packets while MDCX is underway ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf93ceb830a44dafa56430ab5178f05da6bdd6fb Gerrit-Change-Number: 10302 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 16:22:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 16:28:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:28:07 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_?= =?UTF-8?Q?:_master-osmo-mgw_=C2=BB_--enable-mgc?= =?UTF-8?Q?p-transcoding,a2=3Ddefault,a3=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#1232?= In-Reply-To: <1702671108.51.1533139797948.JavaMail.jenkins@jenkins.osmocom.org> References: <1702671108.51.1533139797948.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <361252491.60.1533140887196.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Aug 1 16:28:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:28:12 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_?= =?UTF-8?Q?:_master-osmo-mgw_=C2=BB_--disable-mg?= =?UTF-8?Q?cp-transcoding,a2=3Ddefault,a3=3Ddef?= =?UTF-8?Q?ault,osmocom-master-debian9_#1232?= In-Reply-To: <326185670.50.1533139773830.JavaMail.jenkins@jenkins.osmocom.org> References: <326185670.50.1533139773830.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1479461553.61.1533140892609.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Aug 1 16:29:53 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:29:53 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4915?= In-Reply-To: <1921381202.59.1533140408159.JavaMail.jenkins@jenkins.osmocom.org> References: <1921381202.59.1533140408159.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <622924018.62.1533140993817.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Aug 1 16:30:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:30:46 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4915?= In-Reply-To: <1373599941.58.1533140354273.JavaMail.jenkins@jenkins.osmocom.org> References: <1373599941.58.1533140354273.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1725512194.63.1533141046442.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:36:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 16:36:57 +0000 Subject: Change in osmo-bsc[master]: handover_fsm.c: Fix -Werror=format-security errors Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10303 Change subject: handover_fsm.c: Fix -Werror=format-security errors ...................................................................... handover_fsm.c: Fix -Werror=format-security errors When building with -Werror=format-security, such as our OBS builds, it fails like this: [ 118s] handover_fsm.c: In function 'parse_ho_request': [ 118s] handover_fsm.c:478:4: error: format not a string literal and no format arguments [-Werror=format-security] [ 118s] gsm0808_cell_id_name(&req->cell_id_serving)); [ 118s] ^~~~~~~~~~~~~~~~~~~~ [ 118s] handover_fsm.c:489:4: error: format not a string literal and no format arguments [-Werror=format-security] [ 118s] gsm0808_cell_id_name(&req->cell_id_target)); [ 118s] ^~~~~~~~~~~~~~~~~~~~ [ 120s] cc1: some warnings being treated as errors Let's make sure we don't call sprintf() and friends without a format string. In fact, if we only want to copy a string without extra formatting, use osmo_strlcpy() or OSMO_STRLCPY_ARRAY(). Change-Id: I56cff3618f012f6b019f4fca7e2768814487137a --- M src/osmo-bsc/handover_fsm.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/10303/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index ec2a53d..c2f5c8b 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -474,8 +474,7 @@ } /* LOG_HO() also calls gsm0808_cell_id_name(), so to be able to use gsm0808_cell_id_name() in * logging without getting mixed up with those static buffers, store the result. */ - snprintf(req->cell_id_serving_name, sizeof(req->cell_id_serving_name), - gsm0808_cell_id_name(&req->cell_id_serving)); + OSMO_STRLCPY_ARRAY(req->cell_id_serving_name, gsm0808_cell_id_name(&req->cell_id_serving)); if (!(e = TLVP_GET(tp2, GSM0808_IE_CELL_IDENTIFIER))) { LOG_HO(conn, LOGL_ERROR, "Missing IE: Cell Identifier (Target)\n"); @@ -485,8 +484,7 @@ LOG_HO(conn, LOGL_ERROR, "Invalid IE: Cell Identifier (Target)\n"); return false; } - snprintf(req->cell_id_target_name, sizeof(req->cell_id_target_name), - gsm0808_cell_id_name(&req->cell_id_target)); + OSMO_STRLCPY_ARRAY(req->cell_id_target_name, gsm0808_cell_id_name(&req->cell_id_target)); if ((e = TLVP_GET(tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE))) { int timeslot; -- To view, visit https://gerrit.osmocom.org/10303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I56cff3618f012f6b019f4fca7e2768814487137a Gerrit-Change-Number: 10303 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 1 16:37:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 1 Aug 2018 16:37:26 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2995?= In-Reply-To: <1747706119.57.1533140155099.JavaMail.jenkins@jenkins.osmocom.org> References: <1747706119.57.1533140155099.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1843329738.64.1533141446722.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:46:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 16:46:47 +0000 Subject: Change in osmo-bsc[master]: handover_fsm.c: Fix -Werror=format-security errors In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10303 ) Change subject: handover_fsm.c: Fix -Werror=format-security errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I56cff3618f012f6b019f4fca7e2768814487137a Gerrit-Change-Number: 10303 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 01 Aug 2018 16:46:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 16:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 16:46:51 +0000 Subject: Change in osmo-bsc[master]: handover_fsm.c: Fix -Werror=format-security errors In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10303 ) Change subject: handover_fsm.c: Fix -Werror=format-security errors ...................................................................... handover_fsm.c: Fix -Werror=format-security errors When building with -Werror=format-security, such as our OBS builds, it fails like this: [ 118s] handover_fsm.c: In function 'parse_ho_request': [ 118s] handover_fsm.c:478:4: error: format not a string literal and no format arguments [-Werror=format-security] [ 118s] gsm0808_cell_id_name(&req->cell_id_serving)); [ 118s] ^~~~~~~~~~~~~~~~~~~~ [ 118s] handover_fsm.c:489:4: error: format not a string literal and no format arguments [-Werror=format-security] [ 118s] gsm0808_cell_id_name(&req->cell_id_target)); [ 118s] ^~~~~~~~~~~~~~~~~~~~ [ 120s] cc1: some warnings being treated as errors Let's make sure we don't call sprintf() and friends without a format string. In fact, if we only want to copy a string without extra formatting, use osmo_strlcpy() or OSMO_STRLCPY_ARRAY(). Change-Id: I56cff3618f012f6b019f4fca7e2768814487137a --- M src/osmo-bsc/handover_fsm.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index ec2a53d..c2f5c8b 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -474,8 +474,7 @@ } /* LOG_HO() also calls gsm0808_cell_id_name(), so to be able to use gsm0808_cell_id_name() in * logging without getting mixed up with those static buffers, store the result. */ - snprintf(req->cell_id_serving_name, sizeof(req->cell_id_serving_name), - gsm0808_cell_id_name(&req->cell_id_serving)); + OSMO_STRLCPY_ARRAY(req->cell_id_serving_name, gsm0808_cell_id_name(&req->cell_id_serving)); if (!(e = TLVP_GET(tp2, GSM0808_IE_CELL_IDENTIFIER))) { LOG_HO(conn, LOGL_ERROR, "Missing IE: Cell Identifier (Target)\n"); @@ -485,8 +484,7 @@ LOG_HO(conn, LOGL_ERROR, "Invalid IE: Cell Identifier (Target)\n"); return false; } - snprintf(req->cell_id_target_name, sizeof(req->cell_id_target_name), - gsm0808_cell_id_name(&req->cell_id_target)); + OSMO_STRLCPY_ARRAY(req->cell_id_target_name, gsm0808_cell_id_name(&req->cell_id_target)); if ((e = TLVP_GET(tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE))) { int timeslot; -- To view, visit https://gerrit.osmocom.org/10303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I56cff3618f012f6b019f4fca7e2768814487137a Gerrit-Change-Number: 10303 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 19:27:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 1 Aug 2018 19:27:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mgw: Don't try to send packets while MDCX is underway In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10302 ) Change subject: mgw: Don't try to send packets while MDCX is underway ...................................................................... mgw: Don't try to send packets while MDCX is underway TC_two_crcx_and_one_mdcx_rtp_ho sometimes failed while trying to send an RTP packet without a connected port. f_flow_modify re-bind()s the port, sends the MDCX and then connect()s it after the MDCX ACK returned the IP/port combination. If the transmit timer fires off between the bind and connect the resulting send call will fail. Change-Id: Idf93ceb830a44dafa56430ab5178f05da6bdd6fb --- M mgw/MGCP_Test.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 494e8bb..e1ebc26 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -1258,7 +1258,9 @@ /* Now switch the flow over to a new port (BTS) */ port_old := flow[0].em.portnr; flow[0].em.portnr := 10002; + f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); /* When handing over a call, the old source may still keep * transmitting for a while. We simulate this by injecting -- To view, visit https://gerrit.osmocom.org/10302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idf93ceb830a44dafa56430ab5178f05da6bdd6fb Gerrit-Change-Number: 10302 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 22:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 1 Aug 2018 22:34:41 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: separate burst preprocessing Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10304 Change subject: trx_toolkit/burst_fwd.py: separate burst preprocessing ...................................................................... trx_toolkit/burst_fwd.py: separate burst preprocessing This change separates burst preprocessing (i.e. both RSSI and ToA calculation) from BurstForwarder.transform_msg() because it's not actually related to the message transformation process. Change-Id: Ia7ad970593f38d9a9401975eb6dae67cd0c94e11 --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 24 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/10304/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 144ae5f..bfbe0d6 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -131,8 +131,22 @@ # Generate a random RSSI value return random.randint(rssi_min, rssi_max) + # DL burst preprocessing + def preprocess_dl_burst(self, msg): + # Calculate both RSSI and ToA values + msg.toa256 = self.calc_dl_toa256() + msg.rssi = self.calc_dl_rssi() + + # UL burst preprocessing + def preprocess_ul_burst(self, msg): + # Calculate both RSSI and ToA values, + # also apply Timing Advance + msg.toa256 = self.calc_ul_toa256() + msg.toa256 -= self.calc_ta256() + msg.rssi = self.calc_ul_rssi() + # Converts a L12TRX message to TRX2L1 message - def transform_msg(self, msg_raw, dl = True): + def transform_msg(self, msg_raw): # Attempt to parse a message try: msg_l12trx = DATAMSG_L12TRX() @@ -142,18 +156,7 @@ return None # Compose a new message for L1 - msg_trx2l1 = msg_l12trx.gen_trx2l1() - - # Randomize both RSSI and ToA values - if dl: - msg_trx2l1.toa256 = self.calc_dl_toa256() - msg_trx2l1.rssi = self.calc_dl_rssi() - else: - msg_trx2l1.toa256 = self.calc_ul_toa256() - msg_trx2l1.toa256 -= self.calc_ta256() - msg_trx2l1.rssi = self.calc_ul_rssi() - - return msg_trx2l1 + return msg_l12trx.gen_trx2l1() # Downlink handler: BTS -> BB def bts2bb(self): @@ -169,7 +172,7 @@ return None # Process a message - msg = self.transform_msg(data, dl = True) + msg = self.transform_msg(data) if msg is None: return None @@ -177,6 +180,9 @@ if msg.tn != self.ts_pass: return None + # Burst preprocessing + self.preprocess_dl_burst(msg) + # Validate and generate the payload payload = msg.gen_msg() @@ -201,10 +207,13 @@ return None # Process a message - msg = self.transform_msg(data, dl = False) + msg = self.transform_msg(data) if msg is None: return None + # Burst preprocessing + self.preprocess_ul_burst(msg) + # Validate and generate the payload payload = msg.gen_msg() -- To view, visit https://gerrit.osmocom.org/10304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7ad970593f38d9a9401975eb6dae67cd0c94e11 Gerrit-Change-Number: 10304 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 1 22:34:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 1 Aug 2018 22:34:42 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx: introduce basic path loss simulation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10305 Change subject: trx_toolkit/fake_trx: introduce basic path loss simulation ...................................................................... trx_toolkit/fake_trx: introduce basic path loss simulation This change introduces a couple of new CTRL commands for path loss simulation, in particular a possibility to drop some amount of bursts according to some TDMA frame period, separately for both Uplink and Downlink directions. Examples: FAKE_DROP 4 - drop 4 consistent (period=1) bursts, FAKE_DROP 16 2 - drop 16 even bursts (period=2). Change-Id: Ib210138a03e2377c79875a4ff2f2bb58a43cfa46 Related: OS#3428 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py 3 files changed, 123 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/10305/1 diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index bfbe0d6..3834849 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -66,6 +66,15 @@ rssi_dl_threshold = 10 rssi_ul_threshold = 5 + # Path loss simulation: DL/UL burst dropping + # Indicates how many bursts should be dropped + # and which dropping period is used. By default, + # period is 1, i.e. every burst (fn % 1 is always 0) + burst_dl_drop_amount = 0 + burst_ul_drop_amount = 0 + burst_dl_drop_period = 1 + burst_ul_drop_period = 1 + def __init__(self, bts_link, bb_link): self.bts_link = bts_link self.bb_link = bb_link @@ -131,6 +140,30 @@ # Generate a random RSSI value return random.randint(rssi_min, rssi_max) + # DL path loss simulation + def path_loss_sim_dl(self, msg): + # Burst dropping + if self.burst_dl_drop_amount > 0: + if msg.fn % self.burst_dl_drop_period == 0: + print("[~] Simulation: dropping DL burst (fn=%u %% %u == 0)" + % (msg.fn, self.burst_dl_drop_period)) + self.burst_dl_drop_amount -= 1 + return None + + return msg + + # UL path loss simulation + def path_loss_sim_ul(self, msg): + # Burst dropping + if self.burst_ul_drop_amount > 0: + if msg.fn % self.burst_ul_drop_period == 0: + print("[~] Simulation: dropping UL burst (fn=%u %% %u == 0)" + % (msg.fn, self.burst_ul_drop_period)) + self.burst_ul_drop_amount -= 1 + return None + + return msg + # DL burst preprocessing def preprocess_dl_burst(self, msg): # Calculate both RSSI and ToA values @@ -180,6 +213,11 @@ if msg.tn != self.ts_pass: return None + # Path loss simulation + msg = self.path_loss_sim_dl(msg) + if msg is None: + return None + # Burst preprocessing self.preprocess_dl_burst(msg) @@ -211,6 +249,11 @@ if msg is None: return None + # Path loss simulation + msg = self.path_loss_sim_ul(msg) + if msg is None: + return None + # Burst preprocessing self.preprocess_ul_burst(msg) diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 3de14ef..929caf4 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -150,6 +150,46 @@ return 0 + # Path loss simulation for UL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % 1 == 0 + elif self.verify_cmd(request, "FAKE_DROP", 1): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + self.burst_fwd.burst_ul_drop_amount = num + self.burst_fwd.burst_ul_drop_period = 1 + + return 0 + + # Path loss simulation for UL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % period == 0 + elif self.verify_cmd(request, "FAKE_DROP", 2): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + # Parse / validate period + period = int(request[2]) + if period <= 0: + print("[!] FAKE_DROP period shall be greater than zero") + return -1 + + self.burst_fwd.burst_ul_drop_amount = num + self.burst_fwd.burst_ul_drop_period = period + + return 0 + # Wrong / unknown command else: # We don't care about other commands, diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py index 1488617..72a0371 100644 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ b/src/target/trx_toolkit/ctrl_if_bts.py @@ -118,6 +118,46 @@ return 0 + # Path loss simulation for DL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % 1 == 0 + elif self.verify_cmd(request, "FAKE_DROP", 1): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + self.burst_fwd.burst_dl_drop_amount = num + self.burst_fwd.burst_dl_drop_period = 1 + + return 0 + + # Path loss simulation for DL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % period == 0 + elif self.verify_cmd(request, "FAKE_DROP", 2): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + # Parse / validate period + period = int(request[2]) + if period <= 0: + print("[!] FAKE_DROP period shall be greater than zero") + return -1 + + self.burst_fwd.burst_dl_drop_amount = num + self.burst_fwd.burst_dl_drop_period = period + + return 0 + # Wrong / unknown command else: # We don't care about other commands, -- To view, visit https://gerrit.osmocom.org/10305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib210138a03e2377c79875a4ff2f2bb58a43cfa46 Gerrit-Change-Number: 10305 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 10:03:56 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 10:03:56 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: release endpoints after use Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10306 Change subject: mgcp_test: release endpoints after use ...................................................................... mgcp_test: release endpoints after use The test function test_multilple_codec() in mgcp_test.c creates a lot of connections, but it never releases them. Just freeing the cfg object is not enough since the UDP ports stay open and this may interfere with other tests that also create connections (port numbers). - Make sure all endpoints are released when test_multilple_codec() is done. Change-Id: Ic13b4368162149ec36c93f4188fa4c71166e08d5 --- M tests/mgcp/mgcp_test.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/06/10306/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index df6ea2f..ea79485 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1265,6 +1265,7 @@ struct in_addr addr; struct mgcp_conn_rtp *conn = NULL; char conn_id[256]; + int i; printf("Testing multiple payload types\n"); @@ -1398,6 +1399,9 @@ OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); + for (i = 1; i < cfg->trunk.number_endpoints; i++) + mgcp_endp_release(&cfg->trunk.endpoints[i]); + talloc_free(cfg); } -- To view, visit https://gerrit.osmocom.org/10306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic13b4368162149ec36c93f4188fa4c71166e08d5 Gerrit-Change-Number: 10306 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 10:23:12 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 10:23:12 +0000 Subject: Change in libosmocore[master]: socket: check return code of setsockopt In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10288 ) Change subject: socket: check return code of setsockopt ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96dbccc3bcff35bf39979dbe0c44aadc8ce20c83 Gerrit-Change-Number: 10288 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 02 Aug 2018 10:23:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 10:23:24 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 10:23:24 +0000 Subject: Change in libosmocore[master]: socket: check return code of setsockopt In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/10288 ) Change subject: socket: check return code of setsockopt ...................................................................... socket: check return code of setsockopt the return code of the last setsockopt() call in osmo_sock_init() is not checked. Since all other calls to setsockopt are checked, lets check this one as well. - check return code of setsockopt() and close the socket on failure Change-Id: I96dbccc3bcff35bf39979dbe0c44aadc8ce20c83 --- M src/socket.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: dexter: Verified Harald Welte: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index dc5590c..0a4e34c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -373,7 +373,14 @@ return -ENODEV; } - setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket: %s:%u: %s\n", host, port, + strerror(errno)); + close(sfd); + sfd = -1; + } rc = osmo_sock_init_tail(sfd, type, flags); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/10288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96dbccc3bcff35bf39979dbe0c44aadc8ce20c83 Gerrit-Change-Number: 10288 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 10:28:32 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 10:28:32 +0000 Subject: Change in libosmocore[master]: socket: do not set SO_REUSEADDR for IPPROTO_UDP In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10289 ) Change subject: socket: do not set SO_REUSEADDR for IPPROTO_UDP ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Gerrit-Change-Number: 10289 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 02 Aug 2018 10:28:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 10:30:08 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 10:30:08 +0000 Subject: Change in libosmocore[master]: socket: do not set SO_REUSEADDR for IPPROTO_UDP In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10289 ) Change subject: socket: do not set SO_REUSEADDR for IPPROTO_UDP ...................................................................... Patch Set 3: > Set Ready For Review I did not notice any major problems in my checks. The GSMTAP problem turned out to be normal. I just did not notice the warning before, but it is also there with the current master of libosmocore. However on osmo-mgw there were unit-test problems which are fixed now with #10306 -- To view, visit https://gerrit.osmocom.org/10289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Gerrit-Change-Number: 10289 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 02 Aug 2018 10:30:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 10:53:22 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 10:53:22 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: increment local port number when port is in use Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10307 Change subject: mgcp_client: increment local port number when port is in use ...................................................................... mgcp_client: increment local port number when port is in use The IETF has designated port 2727 for call agents (clients). This works as long as only one call agent is running. As soon as two call agents (e.g. osmo-bsc and osmo-msc) run on the same machine. The port numbers will collide. To avoid such a situation we will first try the IETF port and if we fail to use it we increment the port number until we found a usable port. However, we should only do this if the user has not configured a non standard port. (The rationale behind this is that if there is a non standard port configured the choice must have been made conciously by the user and therefor we should fail hard so that the user gets aware of the problem.) Change-Id: Iaa5f41fdb43ec6bf4feaefa174fd82622e37d4d0 Related: OS#2874 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 37 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/07/10307/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 00b52f8..3663163 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -779,6 +779,42 @@ return mgcp; } +static int init_socket(struct mgcp_client *mgcp) +{ + int rc; + struct osmo_wqueue *wq; + int i; + + wq = &mgcp->wq; + + for (i = 0; i < 100; i++) { + + /* Initalize socket with the currently configured port + * number */ + rc = osmo_sock_init2_ofd(&wq->bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, + mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port, + OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + if (rc > 0) + return rc; + + /* If there is a different port than the default port + * configured then we assume that the user has choosen + * that port conciously and we will not try to resolve + * this by silently choosing a different port. */ + if (mgcp->actual.local_port != MGCP_CLIENT_LOCAL_PORT_DEFAULT) + return -EINVAL; + + /* Choose a new port number to try next */ + LOGP(DLMGCP, LOGL_NOTICE, + "MGCPGW faild to bind to port %u, retrying with port %u -- check configuration!\n", + mgcp->actual.local_port, mgcp->actual.local_port + 1); + mgcp->actual.local_port++; + } + + LOGP(DLMGCP, LOGL_FATAL, "MGCPGW faild to find a port to bind on %i times.\n", i); + return -EINVAL; +} + /*! Initalize client connection (opens socket only, no request is sent yet) * \param[in,out] mgcp MGCP client descriptor. * \returns 0 on success, -EINVAL on error. */ @@ -795,10 +831,7 @@ wq = &mgcp->wq; - rc = osmo_sock_init2_ofd(&wq->bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, - mgcp->actual.local_addr, mgcp->actual.local_port, - mgcp->actual.remote_addr, mgcp->actual.remote_port, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + rc = init_socket(mgcp); if (rc < 0) { LOGP(DLMGCP, LOGL_FATAL, "Failed to initialize socket %s:%u -> %s:%u for MGCP GW: %s\n", -- To view, visit https://gerrit.osmocom.org/10307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa5f41fdb43ec6bf4feaefa174fd82622e37d4d0 Gerrit-Change-Number: 10307 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 11:34:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 11:34:24 +0000 Subject: Change in osmo-bts[master]: Clarify frame loss counter for l1sched_chan_state Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10308 Change subject: Clarify frame loss counter for l1sched_chan_state ...................................................................... Clarify frame loss counter for l1sched_chan_state Each logical channel (e.g. SACCH, SDCCH, etc.) has a counter of lost L2 frames. Let's use a bit better name for it, and correct its description in the 'l1sched_chan_state' struct definition. Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-virtual/scheduler_virtbts.c 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/10308/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 98f38d3..3fe7978 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -78,7 +78,7 @@ int32_t toa256_sum; /* sum of TOA values (1/256 symbol) */ /* loss detection */ - uint8_t lost; /* (SACCH) loss detection */ + uint8_t lost_frames; /* how many L2 frames were lost */ /* mode */ uint8_t rsl_cmode, tch_mode; /* mode for TCH channels */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 3842810..5c250e4 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -367,7 +367,7 @@ memcpy(msg->l2h, l2, l2_len); if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) - l1ts->chan_state[chan].lost = 0; + l1ts->chan_state[chan].lost_frames = 0; /* forward primitive */ l1sap_up(l1t->trx, l1sap); @@ -396,8 +396,8 @@ if (tch_len) memcpy(msg->l2h, tch, tch_len); - if (l1ts->chan_state[chan].lost) - l1ts->chan_state[chan].lost--; + if (l1ts->chan_state[chan].lost_frames) + l1ts->chan_state[chan].lost_frames--; LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, -1, l1sap->u.data.fn, "%s Rx -> RTP: %s\n", diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index a22b53f..4ab937a 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -192,7 +192,7 @@ /* handle loss detection of SACCH */ if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) { /* count and send BFI */ - if (++(l1ts->chan_state[chan].lost) > 1) { + if (++(l1ts->chan_state[chan].lost_frames) > 1) { /* TODO: Should we pass old TOA here? Otherwise we risk * unnecessary decreasing TA */ @@ -351,7 +351,7 @@ /* handle loss detection of received TCH frames */ if (rsl_cmode == RSL_CMOD_SPD_SPEECH - && ++(chan_state->lost) > 5) { + && ++(chan_state->lost_frames) > 5) { uint8_t tch_data[GSM_FR_BYTES]; int len; diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index de995e6..cdbb9c1 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -198,7 +198,7 @@ #if 0 /* handle loss detection of received TCH frames */ if (rsl_cmode == RSL_CMOD_SPD_SPEECH - && ++(chan_state->lost) > 5) { + && ++(chan_state->lost_frames) > 5) { uint8_t tch_data[GSM_FR_BYTES]; int len; -- To view, visit https://gerrit.osmocom.org/10308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82 Gerrit-Change-Number: 10308 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 11:34:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 11:34:26 +0000 Subject: Change in osmo-bts[master]: common/scheduler.c: track TDMA frame loss per logical channels Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10309 Change subject: common/scheduler.c: track TDMA frame loss per logical channels ...................................................................... common/scheduler.c: track TDMA frame loss per logical channels This change modifies the logic of TDMA frame loss tracking. To be more precise, the tracking logic was moved from per timeslot level to per logical channel level, what makes OsmoBTS more accurate in its measurements. But before getting into details, it's important to clarify some things about the Uplink burst processing in transceiver (OsmoTRX). If an Uplink burst is detected, OsmoTRX demodulates it and sends to OsmoBTS. If nothing is detected on a particular timeslot, OsmoTRX will do nothing. In other words, it will not notify OsmoBTS about this. Meanwhile, there are usually a few logical channels mapped to a single TDMA timeslot. Let's use SDCCH8 channel configuration as an example (simplified layout): /* SDCCH/8 (ss=0), subscriber A (active) */ { TRXC_SDCCH8_0, bid=0 }, { TRXC_SDCCH8_0, bid=1 }, { TRXC_SDCCH8_0, bid=2 }, { TRXC_SDCCH8_0, bid=3 }, // <-- last_fn=X /* SDCCH/8 (ss=1), subscriber B (inactive) */ { TRXC_SDCCH8_1, bid=0 }, { TRXC_SDCCH8_1, bid=1 }, { TRXC_SDCCH8_1, bid=2 }, { TRXC_SDCCH8_1, bid=3 }, /* SDCCH/8 (ss=2), subscriber C (active) */ { TRXC_SDCCH8_2, bid=0 }, // <-- current_fn=X+5 { TRXC_SDCCH8_2, bid=1 }, { TRXC_SDCCH8_2, bid=2 }, { TRXC_SDCCH8_2, bid=3 }, SDCCH8 has 8 sub-slots, so up to 8 subscribers can use a single timeslot. Let's imagine there are three subscribers: A, B, and C. Both A and C are active subscribers, i.e. they are continuously transmitting UL bursts, while B is not using ss=1 anymore. The original way of TDMA frame loss tracking was the following: - when an UL burst is received, store it's frame number in the timeslot state structure (last_fn); - when the next UL burst is received on same timeslot, compute how many frames elapsed since the last_fn; - if elapsed = (current_fn - last_fn) is lower than 10, then iterate from (last_fn + 1) until the current_fn and send dummy zero-filled bursts to the higher layers; - otherwise (elapsed > 10), process the current burst, and do nothing :/ According to our example, subscriber A is sending 4 bursts, then nobody is sending anything, and then subscriber C is sending 4 bursts. So, there is a 4 frames long gap between the both transmissions, which is being substituted by dummy bursts. But, as the logical channel on ss=1 is not active, they are dropped. This is not that scary, but the current algorithm produces lots of false-positives, and moreover is not able to track real frame drops in longer periods (i.e. >10). So, tracking the frame loss per individual logical channels makes much more sense. Let's finally drop this hackish 'while (42) { ... }', and track the amount of lost / received TDMA frames (bursts) individually per logical channels. Also, it makes sense to use the amount of lost / received bursts during the calculation of the measurement reports, instead of sending dummy bursts, but let's do this separately. Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Related: OS#3428 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c 2 files changed, 133 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/09/10309/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 3fe7978..4cf5440 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -79,6 +79,9 @@ /* loss detection */ uint8_t lost_frames; /* how many L2 frames were lost */ + uint32_t last_tdma_fn; /* last processed TDMA frame number */ + uint32_t proc_tdma_fs; /* how many TDMA frames were processed */ + uint32_t lost_tdma_fs; /* how many TDMA frames were lost */ /* mode */ uint8_t rsl_cmode, tch_mode; /* mode for TCH channels */ @@ -123,7 +126,6 @@ struct l1sched_ts { uint8_t mf_index; /* selected multiframe index */ - uint32_t mf_last_fn; /* last received frame number */ uint8_t mf_period; /* period of multiframe */ const struct trx_sched_frame *mf_frames; /* pointer to frame layout */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 5c250e4..9b36fa2 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -219,7 +219,6 @@ struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); l1ts->mf_index = 0; - l1ts->mf_last_fn = 0; INIT_LLIST_HEAD(&l1ts->dl_prims); for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) { struct l1sched_chan_state *chan_state; @@ -850,8 +849,106 @@ return bits; } +#define TDMA_FN_SUM(a, b) \ + ((a + GSM_HYPERFRAME + b) % GSM_HYPERFRAME) + +#define TDMA_FN_SUB(a, b) \ + ((a + GSM_HYPERFRAME - b) % GSM_HYPERFRAME) + +static int trx_sched_calc_frame_loss(struct l1sched_trx *l1t, + struct l1sched_chan_state *l1cs, uint8_t tn, uint32_t fn) +{ + const struct trx_sched_frame *frame_head; + const struct trx_sched_frame *frame; + struct l1sched_ts *l1ts; + uint32_t elapsed_fs; + uint8_t offset, i; + uint32_t fn_i; + + /** + * When a channel is just activated, the MS needs some time + * to synchronize and start burst transmission, + * so let's wait until the first UL burst... + */ + if (l1cs->proc_tdma_fs == 0) + return 0; + + /* Get current TDMA frame info */ + l1ts = l1sched_trx_get_ts(l1t, tn); + offset = fn % l1ts->mf_period; + frame_head = l1ts->mf_frames + offset; + + /* Not applicable for RACH */ + if (frame_head->ul_chan == TRXC_RACH || l1cs->ho_rach_detect) + return 0; + + /* How many frames elapsed since the last one? */ + elapsed_fs = TDMA_FN_SUB(fn, l1cs->last_tdma_fn); + if (elapsed_fs > l1ts->mf_period) { /* Too many! */ + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, frame_head->ul_chan, fn, + "Too many (>%u) contiguous TDMA frames=%u elapsed " + "since the last processed fn=%u\n", l1ts->mf_period, + elapsed_fs, l1cs->last_tdma_fn); + /* FIXME: how should this affect the measurements? */ + return -EINVAL; + } + + /** + * There are several TDMA frames between the last processed + * frame and currently received one. Let's walk through this + * path and count potentially lost frames, i.e. for which + * we didn't receive the corresponsing UL bursts. + * + * Start counting from the last_fn + 1. + */ + for (i = 1; i < elapsed_fs; i++) { + fn_i = TDMA_FN_SUM(l1cs->last_tdma_fn, i); + offset = fn_i % l1ts->mf_period; + frame = l1ts->mf_frames + offset; + + if (frame->ul_chan == frame_head->ul_chan) + l1cs->lost_tdma_fs++; + } + + if (l1cs->lost_tdma_fs > 0) { + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, frame_head->ul_chan, fn, + "At least %u TDMA frames were lost since the last " + "processed fn=%u\n", l1cs->lost_tdma_fs, l1cs->last_tdma_fn); + + /** + * HACK: substitute lost bursts by zero-filled ones + * + * Instead of doing this, it makes sense to use the + * amount of lost frames in measurement calculations. + */ + static sbit_t zero_burst[GSM_BURST_LEN] = { 0 }; + trx_sched_ul_func *func; + + for (i = 1; i < elapsed_fs; i++) { + fn_i = TDMA_FN_SUM(l1cs->last_tdma_fn, i); + offset = fn_i % l1ts->mf_period; + frame = l1ts->mf_frames + offset; + func = trx_chan_desc[frame->ul_chan].ul_fn; + + if (frame->ul_chan != frame_head->ul_chan) + continue; + + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, frame->ul_chan, fn, + "Substituting lost TDMA frame=%u by all-zero " + "dummy burst\n", fn_i); + + func(l1t, tn, fn_i, frame->ul_chan, frame->ul_bid, + zero_burst, GSM_BURST_LEN, -128, 0); + + l1cs->lost_tdma_fs--; + } + } + + return 0; +} + /* process uplink burst */ -int trx_sched_ul_burst(struct l1sched_trx *l1t, uint8_t tn, uint32_t current_fn, +int trx_sched_ul_burst(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, sbit_t *bits, uint16_t nbits, int8_t rssi, int16_t toa256) { struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); @@ -860,82 +957,51 @@ uint8_t offset, period, bid; trx_sched_ul_func *func; enum trx_chan_type chan; - uint32_t fn, elapsed; if (!l1ts->mf_index) return -EINVAL; - /* calculate how many frames have been elapsed */ - elapsed = (current_fn + GSM_HYPERFRAME - l1ts->mf_last_fn) % GSM_HYPERFRAME; + /* get frame from multiframe */ + period = l1ts->mf_period; + offset = fn % period; + frame = l1ts->mf_frames + offset; - /* start counting from last fn + 1, but only if not too many fn have - * been elapsed */ - if (elapsed < 10) { - fn = (l1ts->mf_last_fn + 1) % GSM_HYPERFRAME; - } else { - LOGPFN(DL1P, LOGL_NOTICE, current_fn, - "Too many contiguous elapsed fn, dropping %u\n", elapsed); - fn = current_fn; - } + chan = frame->ul_chan; + bid = frame->ul_bid; + l1cs = &l1ts->chan_state[chan]; + func = trx_chan_desc[chan].ul_fn; - while (42) { - /* get frame from multiframe */ - period = l1ts->mf_period; - offset = fn % period; - frame = l1ts->mf_frames + offset; + /* check if channel is active */ + if (!trx_chan_desc[chan].auto_active && !l1cs->active) + return -EINVAL; - chan = frame->ul_chan; - bid = frame->ul_bid; - func = trx_chan_desc[chan].ul_fn; + /* omit bursts which have no handler, like IDLE bursts */ + if (!func) + return -EINVAL; - l1cs = &l1ts->chan_state[chan]; + /* calculate how many TDMA frames were potentially lost */ + trx_sched_calc_frame_loss(l1t, l1cs, tn, fn); - /* check if channel is active */ - if (!trx_chan_desc[chan].auto_active && !l1cs->active) - goto next_frame; + /* update TDMA frame counters */ + l1cs->last_tdma_fn = fn; + l1cs->proc_tdma_fs++; - /* omit bursts which have no handler, like IDLE bursts */ - if (!func) - goto next_frame; + /* decrypt */ + if (bits && l1cs->ul_encr_algo) { + ubit_t ks[114]; + int i; - /* put burst to function */ - if (fn == current_fn) { - /* decrypt */ - if (bits && l1cs->ul_encr_algo) { - ubit_t ks[114]; - int i; - - osmo_a5(l1cs->ul_encr_algo, - l1cs->ul_encr_key, - fn, NULL, ks); - for (i = 0; i < 57; i++) { - if (ks[i]) - bits[i + 3] = - bits[i + 3]; - if (ks[i + 57]) - bits[i + 88] = - bits[i + 88]; - } - } - - func(l1t, tn, fn, chan, bid, bits, nbits, rssi, toa256); - } else if (chan != TRXC_RACH && !l1cs->ho_rach_detect) { - sbit_t spare[GSM_BURST_LEN]; - memset(spare, 0, GSM_BURST_LEN); - /* We missed a couple of frame numbers (system overload?) and are now - * substituting some zero-filled bursts for those bursts we missed */ - LOGPFN(DL1P, LOGL_ERROR, fn, "Substituting all-zero burst (current_fn=%u, " - "elapsed=%u\n", current_fn, elapsed); - func(l1t, tn, fn, chan, bid, spare, GSM_BURST_LEN, -128, 0); + osmo_a5(l1cs->ul_encr_algo, l1cs->ul_encr_key, fn, NULL, ks); + for (i = 0; i < 57; i++) { + if (ks[i]) + bits[i + 3] = - bits[i + 3]; + if (ks[i + 57]) + bits[i + 88] = - bits[i + 88]; } - -next_frame: - /* reached current fn */ - if (fn == current_fn) - break; - - fn = (fn + 1) % GSM_HYPERFRAME; } - l1ts->mf_last_fn = fn; + /* put burst to function */ + func(l1t, tn, fn, chan, bid, bits, nbits, rssi, toa256); return 0; } -- To view, visit https://gerrit.osmocom.org/10309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Gerrit-Change-Number: 10309 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 11:41:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 11:41:31 +0000 Subject: Change in osmo-bts[master]: common/scheduler.c: track TDMA frame loss per logical channels In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10309 ) Change subject: common/scheduler.c: track TDMA frame loss per logical channels ...................................................................... common/scheduler.c: track TDMA frame loss per logical channels This change modifies the logic of TDMA frame loss tracking. To be more precise, the tracking logic was moved from per timeslot level to per logical channel level, what makes OsmoBTS more accurate in its measurements. But before getting into details, it's important to clarify some things about the Uplink burst processing in transceiver (OsmoTRX). If an Uplink burst is detected, OsmoTRX demodulates it and sends to OsmoBTS. If nothing is detected on a particular timeslot, OsmoTRX will do nothing. In other words, it will not notify OsmoBTS about this. Meanwhile, there are usually a few logical channels mapped to a single TDMA timeslot. Let's use SDCCH8 channel configuration as an example (simplified layout): /* SDCCH/8 (ss=0), subscriber A (active) */ { TRXC_SDCCH8_0, bid=0 }, { TRXC_SDCCH8_0, bid=1 }, { TRXC_SDCCH8_0, bid=2 }, { TRXC_SDCCH8_0, bid=3 }, // <-- last_fn=X /* SDCCH/8 (ss=1), subscriber B (inactive) */ { TRXC_SDCCH8_1, bid=0 }, { TRXC_SDCCH8_1, bid=1 }, { TRXC_SDCCH8_1, bid=2 }, { TRXC_SDCCH8_1, bid=3 }, /* SDCCH/8 (ss=2), subscriber C (active) */ { TRXC_SDCCH8_2, bid=0 }, // <-- current_fn=X+5 { TRXC_SDCCH8_2, bid=1 }, { TRXC_SDCCH8_2, bid=2 }, { TRXC_SDCCH8_2, bid=3 }, SDCCH8 has 8 sub-slots, so up to 8 subscribers can use a single timeslot. Let's imagine there are three subscribers: A, B, and C. Both A and C are active subscribers, i.e. they are continuously transmitting UL bursts, while B is not using ss=1 anymore. The original way of TDMA frame loss tracking was the following: - when an UL burst is received, store it's frame number in the timeslot state structure (last_fn); - when the next UL burst is received on same timeslot, compute how many frames elapsed since the last_fn; - if elapsed = (current_fn - last_fn) is lower than 10, then iterate from (last_fn + 1) until the current_fn and send dummy zero-filled bursts to the higher layers; - otherwise (elapsed > 10), process the current burst, and do nothing :/ According to our example, subscriber A is sending 4 bursts, then nobody is sending anything, and then subscriber C is sending 4 bursts. So, there is a 4 frames long gap between the both transmissions, which is being substituted by dummy bursts. But, as the logical channel on ss=1 is not active, they are dropped. This is not that scary, but the current algorithm produces lots of false-positives, and moreover is not able to track real frame drops in longer periods (i.e. >10). So, tracking the frame loss per individual logical channels makes much more sense. Let's finally drop this hackish 'while (42) { ... }', and track the amount of lost / received TDMA frames (bursts) individually per logical channels. Let's also use the multiframe period as the loss detection period, instead of hardcoded 10. And finally, let's print more informative debug messages. Also, it makes sense to use the amount of lost / received bursts during the calculation of the measurement reports, instead of sending dummy bursts, but let's do this separately. Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Related: OS#3428 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c 2 files changed, 133 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/09/10309/2 -- To view, visit https://gerrit.osmocom.org/10309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I70d05b67a35ddcbdd1b6394dbd7198404a440e76 Gerrit-Change-Number: 10309 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-CC: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 11:59:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 11:59:37 +0000 Subject: Change in libosmocore[master]: socket: do not set SO_REUSEADDR for IPPROTO_UDP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10289 ) Change subject: socket: do not set SO_REUSEADDR for IPPROTO_UDP ...................................................................... socket: do not set SO_REUSEADDR for IPPROTO_UDP When UDP is used as protocol (proto=IPPROTO_DUP), then we should not set SO_REUSEADDR in the socket option. Because if we do, we allow two processes to bind on the same UDP port. The errornous situation will be undetectable to both applications. So lets only set SO_REUSEADDR when we do not use UDP. - Add check if we use UDP, if yes do not set SO_REUSEADDR Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Related: OS#3441 --- M src/socket.c 1 file changed, 33 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index 0a4e34c..210dbf9 100644 --- a/src/socket.c +++ b/src/socket.c @@ -209,16 +209,20 @@ if (sfd < 0) continue; - rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, - &on, sizeof(on)); - if (rc < 0) { - LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket:" - " %s:%u: %s\n", - local_host, local_port, strerror(errno)); - close(sfd); - continue; + if (proto != IPPROTO_UDP) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket:" + " %s:%u: %s\n", + local_host, local_port, + strerror(errno)); + close(sfd); + continue; + } } + if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == -1) { LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: %s:%u: %s\n", local_host, local_port, strerror(errno)); @@ -345,15 +349,17 @@ continue; } } else { - rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, - &on, sizeof(on)); - if (rc < 0) { - LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket:" - " %s:%u: %s\n", - host, port, strerror(errno)); - close(sfd); - continue; + if (proto != IPPROTO_UDP) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket:" + " %s:%u: %s\n", + host, port, strerror(errno)); + close(sfd); + continue; + } } if (bind(sfd, rp->ai_addr, rp->ai_addrlen) == -1) { LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket:" @@ -373,13 +379,15 @@ return -ENODEV; } - rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (rc < 0) { - LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket: %s:%u: %s\n", host, port, - strerror(errno)); - close(sfd); - sfd = -1; + if (proto != IPPROTO_UDP) { + rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt socket: %s:%u: %s\n", host, + port, strerror(errno)); + close(sfd); + sfd = -1; + } } rc = osmo_sock_init_tail(sfd, type, flags); -- To view, visit https://gerrit.osmocom.org/10289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 Gerrit-Change-Number: 10289 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:00:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:00:06 +0000 Subject: Change in osmo-bts[master]: Clarify frame loss counter for l1sched_chan_state In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10308 ) Change subject: Clarify frame loss counter for l1sched_chan_state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82 Gerrit-Change-Number: 10308 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 12:00:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:00:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:00:08 +0000 Subject: Change in osmo-bts[master]: Clarify frame loss counter for l1sched_chan_state In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10308 ) Change subject: Clarify frame loss counter for l1sched_chan_state ...................................................................... Clarify frame loss counter for l1sched_chan_state Each logical channel (e.g. SACCH, SDCCH, etc.) has a counter of lost L2 frames. Let's use a bit better name for it, and correct its description in the 'l1sched_chan_state' struct definition. Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-virtual/scheduler_virtbts.c 4 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 98f38d3..3fe7978 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -78,7 +78,7 @@ int32_t toa256_sum; /* sum of TOA values (1/256 symbol) */ /* loss detection */ - uint8_t lost; /* (SACCH) loss detection */ + uint8_t lost_frames; /* how many L2 frames were lost */ /* mode */ uint8_t rsl_cmode, tch_mode; /* mode for TCH channels */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 3842810..5c250e4 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -367,7 +367,7 @@ memcpy(msg->l2h, l2, l2_len); if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) - l1ts->chan_state[chan].lost = 0; + l1ts->chan_state[chan].lost_frames = 0; /* forward primitive */ l1sap_up(l1t->trx, l1sap); @@ -396,8 +396,8 @@ if (tch_len) memcpy(msg->l2h, tch, tch_len); - if (l1ts->chan_state[chan].lost) - l1ts->chan_state[chan].lost--; + if (l1ts->chan_state[chan].lost_frames) + l1ts->chan_state[chan].lost_frames--; LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, -1, l1sap->u.data.fn, "%s Rx -> RTP: %s\n", diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index a22b53f..4ab937a 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -192,7 +192,7 @@ /* handle loss detection of SACCH */ if (L1SAP_IS_LINK_SACCH(trx_chan_desc[chan].link_id)) { /* count and send BFI */ - if (++(l1ts->chan_state[chan].lost) > 1) { + if (++(l1ts->chan_state[chan].lost_frames) > 1) { /* TODO: Should we pass old TOA here? Otherwise we risk * unnecessary decreasing TA */ @@ -351,7 +351,7 @@ /* handle loss detection of received TCH frames */ if (rsl_cmode == RSL_CMOD_SPD_SPEECH - && ++(chan_state->lost) > 5) { + && ++(chan_state->lost_frames) > 5) { uint8_t tch_data[GSM_FR_BYTES]; int len; diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index de995e6..cdbb9c1 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -198,7 +198,7 @@ #if 0 /* handle loss detection of received TCH frames */ if (rsl_cmode == RSL_CMOD_SPD_SPEECH - && ++(chan_state->lost) > 5) { + && ++(chan_state->lost_frames) > 5) { uint8_t tch_data[GSM_FR_BYTES]; int len; -- To view, visit https://gerrit.osmocom.org/10308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I92ef95f6b3f647170cfd434a970701406b0a7c82 Gerrit-Change-Number: 10308 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:01:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:01:11 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: increment local port number when port is in use In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10307 ) Change subject: mgcp_client: increment local port number when port is in use ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa5f41fdb43ec6bf4feaefa174fd82622e37d4d0 Gerrit-Change-Number: 10307 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 12:01:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:01:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:01:13 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: use IETF source port as for MGCP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10188 ) Change subject: mgcp_client: use IETF source port as for MGCP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96de84df3a3bf623d98b057ec3f3f621a3330a8a Gerrit-Change-Number: 10188 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 02 Aug 2018 12:01:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:01:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:01:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: use IETF source port as for MGCP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10188 ) Change subject: mgcp_client: use IETF source port as for MGCP ...................................................................... mgcp_client: use IETF source port as for MGCP At the moment the mgcp client uses an arbitrary port as sourceport to exchange MGCP messages with the MGW. However, IETF has designated a specific port as sourceport for MGCP clients (Call agents), which is 2727. See also RFC3435, capter 3.5 Transmission over UDP. - Change MGCP_CLIENT_LOCAL_PORT_DEFAULT from 0 to 2727 Change-Id: I96de84df3a3bf623d98b057ec3f3f621a3330a8a Closes: OS#2874 --- M include/osmocom/mgcp_client/mgcp_client.h 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index 19c684d..ed2dfb0 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -5,8 +5,9 @@ #include +/* See also: RFC 3435, chapter 3.5 Transmission over UDP */ #define MGCP_CLIENT_LOCAL_ADDR_DEFAULT "0.0.0.0" -#define MGCP_CLIENT_LOCAL_PORT_DEFAULT 0 +#define MGCP_CLIENT_LOCAL_PORT_DEFAULT 2727 #define MGCP_CLIENT_REMOTE_ADDR_DEFAULT "127.0.0.1" #define MGCP_CLIENT_REMOTE_PORT_DEFAULT 2427 -- To view, visit https://gerrit.osmocom.org/10188 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96de84df3a3bf623d98b057ec3f3f621a3330a8a Gerrit-Change-Number: 10188 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:01:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:01:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: increment local port number when port is in use In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10307 ) Change subject: mgcp_client: increment local port number when port is in use ...................................................................... mgcp_client: increment local port number when port is in use The IETF has designated port 2727 for call agents (clients). This works as long as only one call agent is running. As soon as two call agents (e.g. osmo-bsc and osmo-msc) run on the same machine. The port numbers will collide. To avoid such a situation we will first try the IETF port and if we fail to use it we increment the port number until we found a usable port. However, we should only do this if the user has not configured a non standard port. (The rationale behind this is that if there is a non standard port configured the choice must have been made conciously by the user and therefor we should fail hard so that the user gets aware of the problem.) Change-Id: Iaa5f41fdb43ec6bf4feaefa174fd82622e37d4d0 Related: OS#2874 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 37 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 00b52f8..3663163 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -779,6 +779,42 @@ return mgcp; } +static int init_socket(struct mgcp_client *mgcp) +{ + int rc; + struct osmo_wqueue *wq; + int i; + + wq = &mgcp->wq; + + for (i = 0; i < 100; i++) { + + /* Initalize socket with the currently configured port + * number */ + rc = osmo_sock_init2_ofd(&wq->bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, + mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port, + OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + if (rc > 0) + return rc; + + /* If there is a different port than the default port + * configured then we assume that the user has choosen + * that port conciously and we will not try to resolve + * this by silently choosing a different port. */ + if (mgcp->actual.local_port != MGCP_CLIENT_LOCAL_PORT_DEFAULT) + return -EINVAL; + + /* Choose a new port number to try next */ + LOGP(DLMGCP, LOGL_NOTICE, + "MGCPGW faild to bind to port %u, retrying with port %u -- check configuration!\n", + mgcp->actual.local_port, mgcp->actual.local_port + 1); + mgcp->actual.local_port++; + } + + LOGP(DLMGCP, LOGL_FATAL, "MGCPGW faild to find a port to bind on %i times.\n", i); + return -EINVAL; +} + /*! Initalize client connection (opens socket only, no request is sent yet) * \param[in,out] mgcp MGCP client descriptor. * \returns 0 on success, -EINVAL on error. */ @@ -795,10 +831,7 @@ wq = &mgcp->wq; - rc = osmo_sock_init2_ofd(&wq->bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, - mgcp->actual.local_addr, mgcp->actual.local_port, - mgcp->actual.remote_addr, mgcp->actual.remote_port, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + rc = init_socket(mgcp); if (rc < 0) { LOGP(DLMGCP, LOGL_FATAL, "Failed to initialize socket %s:%u -> %s:%u for MGCP GW: %s\n", -- To view, visit https://gerrit.osmocom.org/10307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa5f41fdb43ec6bf4feaefa174fd82622e37d4d0 Gerrit-Change-Number: 10307 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:01:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:01:30 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: release endpoints after use In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10306 ) Change subject: mgcp_test: release endpoints after use ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic13b4368162149ec36c93f4188fa4c71166e08d5 Gerrit-Change-Number: 10306 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 12:01:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 12:01:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 12:01:32 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: release endpoints after use In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10306 ) Change subject: mgcp_test: release endpoints after use ...................................................................... mgcp_test: release endpoints after use The test function test_multilple_codec() in mgcp_test.c creates a lot of connections, but it never releases them. Just freeing the cfg object is not enough since the UDP ports stay open and this may interfere with other tests that also create connections (port numbers). - Make sure all endpoints are released when test_multilple_codec() is done. Change-Id: Ic13b4368162149ec36c93f4188fa4c71166e08d5 --- M tests/mgcp/mgcp_test.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index df6ea2f..ea79485 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1265,6 +1265,7 @@ struct in_addr addr; struct mgcp_conn_rtp *conn = NULL; char conn_id[256]; + int i; printf("Testing multiple payload types\n"); @@ -1398,6 +1399,9 @@ OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); + for (i = 1; i < cfg->trunk.number_endpoints; i++) + mgcp_endp_release(&cfg->trunk.endpoints[i]); + talloc_free(cfg); } -- To view, visit https://gerrit.osmocom.org/10306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic13b4368162149ec36c93f4188fa4c71166e08d5 Gerrit-Change-Number: 10306 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:28:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 15:28:48 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10310 Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() ...................................................................... mgcp_sdp: restructure mgcp_write_response_sdp() The function mgcp_write_response_sdp() generates the rtpmap lines in the sdp response. Since we will likely support multiple codecs we will need to generate several rtpmap lines. Therefore it makes sense to split up that part in a separate function without altering the overall functionality (yet) - add static function add_rtpmap() to generate the rtpmap. Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Related: OS#3442 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/10/10310/1 diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 102c8c3..798b3b2 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -286,6 +286,24 @@ return 0; } + +/* Add rtpmap string to the sdp payload, but only when the payload type falls + * into the dynamic payload type range */ +static int add_rtpmap(struct msgb *sdp, int payload_type, char *audio_name) +{ + int rc; + + if (payload_type >= 96 && payload_type <= 127) { + if (!audio_name) + return -EINVAL; + rc = msgb_printf(sdp, "a=rtpmap:%d %s\r\n", payload_type, audio_name); + if (rc < 0) + return -EINVAL; + } + + return 0; +} + /*! Generate SDP response string. * \param[in] endp trunk endpoint. * \param[in] conn associated rtp connection. @@ -328,12 +346,8 @@ if (rc < 0) goto buffer_too_small; - /* FIXME: Check if the payload type is from the static range, - * if yes, omitthe a=rtpmap since it is unnecessary */ - if (audio_name && endp->tcfg->audio_send_name && (payload_type >= 96 && payload_type <= 127)) { - rc = msgb_printf(sdp, "a=rtpmap:%d %s\r\n", - payload_type, audio_name); - + if (endp->tcfg->audio_send_name) { + rc = add_rtpmap(sdp, payload_type, audio_name); if (rc < 0) goto buffer_too_small; } -- To view, visit https://gerrit.osmocom.org/10310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Gerrit-Change-Number: 10310 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:44 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:44 +0000 Subject: Change in simtrace2[master]: cardem: use TC2 as WI and update WT after ATR Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10311 Change subject: cardem: use TC2 as WI and update WT after ATR ...................................................................... cardem: use TC2 as WI and update WT after ATR Change-Id: I3e51b16d557bc664f87563e1a3dce6642de474d2 --- M firmware/libcommon/source/card_emu.c 1 file changed, 33 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/11/10311/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 51fd923..ad6b4d9 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -363,11 +363,39 @@ TRACE_DEBUG("%u: ATR TX: %02x\n\r", ch->num, byte); return 1; } else { /* The ATR has been completely transmitted */ - /* TODO update WI using optional TC2 and then update WT */ - //ch->wi = ISO7816_3_DEFAULT_WI; - /* update waiting time */ - //ch->waiting_time = ISO7816_3_INIT_WTIME; - //tc_etu_set_wtime(ch->tc_chan, ch->waiting_time); + /* search for TC2 to updated WI */ + ch->wi = ISO7816_3_DEFAULT_WI; + if (ch->atr.len >= 2 && ch->atr.atr[1] & 0xf0) { /* Y1 has some data */ + uint8_t atr_td1 = 2; + if (ch->atr.atr[1] & 0x10) { /* TA1 is present */ + atr_td1++; + } + if (ch->atr.atr[1] & 0x20) { /* TB1 is present */ + atr_td1++; + } + if (ch->atr.atr[1] & 0x40) { /* TC1 is present */ + atr_td1++; + } + if (ch->atr.atr[1] & 0x80) { /* TD1 is present */ + if (ch->atr.len > atr_td1 && ch->atr.atr[atr_td1] & 0xf0) { /* Y2 has some data */ + uint8_t atr_tc2 = atr_td1+1; + if (ch->atr.atr[atr_td1] & 0x10) { /* TA2 is present */ + atr_tc2++; + } + if (ch->atr.atr[atr_td1] & 0x20) { /* TB2 is present */ + atr_tc2++; + } + if (ch->atr.atr[atr_td1] & 0x40) { /* TC2 is present */ + if (ch->atr.len > atr_tc2 && ch->atr.atr[atr_tc2]) { /* TC2 encodes WI */ + ch->wi = ch->atr.atr[atr_tc2]; /* set WI */ + } + } + } + } + } + /* update waiting time (see ISO 7816-3 10.2) */ + ch->waiting_time = ch->wi * 960 * ch->fi; + tc_etu_set_wtime(ch->tc_chan, ch->waiting_time); /* reset PTS to initial state */ set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); /* go to next state */ -- To view, visit https://gerrit.osmocom.org/10311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3e51b16d557bc664f87563e1a3dce6642de474d2 Gerrit-Change-Number: 10311 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:45 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:45 +0000 Subject: Change in simtrace2[master]: sniff: send incomplete TPDU when reset is asserted Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10312 Change subject: sniff: send incomplete TPDU when reset is asserted ...................................................................... sniff: send incomplete TPDU when reset is asserted Change-Id: I8d7e4d604cded535e40d27c2be872268e0f24c20 --- M firmware/libcommon/source/sniffer.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/12/10312/1 diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 982653c..3cd0b89 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -1050,6 +1050,23 @@ /* Handle flags */ if (change_flags) { /* WARNING this is not synced with the data buffer handling */ if (change_flags & SNIFF_CHANGE_FLAG_RESET_ASSERT) { + switch (iso_state) { + case ISO7816_S_IN_ATR: + led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ + usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */ + break; + case ISO7816_S_IN_TPDU: + led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ + usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */ + break; + case ISO7816_S_IN_PPS_REQ: + case ISO7816_S_IN_PPS_RSP: + led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ + usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */ + break; + default: + break; + } if (ISO7816_S_RESET != iso_state) { change_state(ISO7816_S_RESET); printf("reset asserted\n\r"); -- To view, visit https://gerrit.osmocom.org/10312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8d7e4d604cded535e40d27c2be872268e0f24c20 Gerrit-Change-Number: 10312 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:45 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:45 +0000 Subject: Change in simtrace2[master]: add synchronous UART transmission and use it in exceptions Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10313 Change subject: add synchronous UART transmission and use it in exceptions ...................................................................... add synchronous UART transmission and use it in exceptions The default ISR (particularly the HardFault handler) print information, but this information was not displayed on the console because the UART IRQ is lower than some default blocking IRQ. Allowing to set synchronous transfer corrects this. The underlying Atmel exception library had to be modified to use the synchronous output, and is now specific to this project since it includes the uart_console library. Making UART_PutChar always synchronous when called from an ISR is not desired because we use TRACE_ macros is some ISR. The synchronous output must be set explicitly. Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c M firmware/libboard/common/include/uart_console.h M firmware/libboard/common/source/uart_console.c 3 files changed, 74 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/13/10313/1 diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c index 74e0fbd..e1e8306 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c @@ -2,6 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2009, Atmel Corporation + * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -42,6 +43,7 @@ *----------------------------------------------------------------------------*/ #include "chip.h" +#include "uart_console.h" /*---------------------------------------------------------------------------- * Exported functions @@ -52,6 +54,7 @@ */ void IrqHandlerNotUsed( void ) { + UART_SetSync( true ); printf("NotUsed\r\n"); while ( 1 ) ; } @@ -61,6 +64,7 @@ */ WEAK void NMI_Handler( void ) { + UART_SetSync( true ); printf("NMI\r\n"); while ( 1 ) ; } @@ -81,6 +85,7 @@ void hard_fault_handler_c(struct hardfault_args *args) { + UART_SetSync( true ); printf("\r\nHardFault\r\n"); printf("R0=%08x, R1=%08x, R2=%08x, R3=%08x, R12=%08x\r\n", args->r0, args->r1, args->r2, args->r3, args->r12); @@ -158,6 +163,7 @@ */ WEAK void MemManage_Handler( void ) { + UART_SetSync( true ); printf("MemManage\r\n"); while ( 1 ) ; } @@ -167,6 +173,7 @@ */ WEAK void BusFault_Handler( void ) { + UART_SetSync( true ); printf("BusFault\r\n"); while ( 1 ) ; } @@ -176,6 +183,7 @@ */ WEAK void UsageFault_Handler( void ) { + UART_SetSync( true ); printf("UsageFault\r\n"); while ( 1 ) ; } @@ -185,6 +193,7 @@ */ WEAK void SVC_Handler( void ) { + UART_SetSync( true ); printf("SVC\r\n"); while ( 1 ) ; } @@ -194,6 +203,7 @@ */ WEAK void DebugMon_Handler( void ) { + UART_SetSync( true ); printf("DebugMon\r\n"); while ( 1 ) ; } @@ -203,6 +213,7 @@ */ WEAK void PendSV_Handler( void ) { + UART_SetSync( true ); printf("PendSV\r\n"); while ( 1 ) ; } @@ -212,6 +223,7 @@ */ WEAK void SysTick_Handler( void ) { + UART_SetSync( true ); printf("SysTick\r\n"); while ( 1 ) ; } @@ -221,6 +233,7 @@ */ WEAK void SUPC_IrqHandler( void ) { + UART_SetSync( true ); printf("SUPC\r\n"); while ( 1 ) ; } @@ -230,6 +243,7 @@ */ WEAK void RSTC_IrqHandler( void ) { + UART_SetSync( true ); printf("RSTC\r\n"); while ( 1 ) ; } @@ -239,6 +253,7 @@ */ WEAK void RTC_IrqHandler( void ) { + UART_SetSync( true ); printf("RTC\r\n"); while ( 1 ) ; } @@ -248,6 +263,7 @@ */ WEAK void RTT_IrqHandler( void ) { + UART_SetSync( true ); printf("RTT\r\n"); while ( 1 ) ; } @@ -257,6 +273,7 @@ */ WEAK void WDT_IrqHandler( void ) { + UART_SetSync( true ); printf("WDT\r\n"); while ( 1 ) ; } @@ -266,6 +283,7 @@ */ WEAK void PMC_IrqHandler( void ) { + UART_SetSync( true ); printf("PMC\r\n"); while ( 1 ) ; } @@ -275,6 +293,7 @@ */ WEAK void EEFC_IrqHandler( void ) { + UART_SetSync( true ); printf("EEFC\r\n"); while ( 1 ) ; } @@ -284,6 +303,7 @@ */ WEAK void UART0_IrqHandler( void ) { + UART_SetSync( true ); printf("UART0\r\n"); while ( 1 ) ; } @@ -293,6 +313,7 @@ */ WEAK void UART1_IrqHandler( void ) { + UART_SetSync( true ); printf("UART1\r\n"); while ( 1 ) ; } @@ -302,6 +323,7 @@ */ WEAK void SMC_IrqHandler( void ) { + UART_SetSync( true ); printf("SMC\r\n"); while ( 1 ) ; } @@ -311,6 +333,7 @@ */ WEAK void PIOA_IrqHandler( void ) { + UART_SetSync( true ); printf("PIOA\r\n"); while ( 1 ) ; } @@ -320,6 +343,7 @@ */ WEAK void PIOB_IrqHandler( void ) { + UART_SetSync( true ); printf("PIOB\r\n"); while ( 1 ) ; } @@ -329,6 +353,7 @@ */ WEAK void PIOC_IrqHandler( void ) { + UART_SetSync( true ); printf("PIOC\r\n"); while ( 1 ) ; } @@ -338,6 +363,7 @@ */ WEAK void USART0_IrqHandler( void ) { + UART_SetSync( true ); printf("USART0\r\n"); while ( 1 ) ; } @@ -347,6 +373,7 @@ */ WEAK void USART1_IrqHandler( void ) { + UART_SetSync( true ); printf("USART1\r\n"); while ( 1 ) ; } @@ -356,6 +383,7 @@ */ WEAK void MCI_IrqHandler( void ) { + UART_SetSync( true ); printf("MCI\r\n"); while ( 1 ) ; } @@ -365,6 +393,7 @@ */ WEAK void TWI0_IrqHandler( void ) { + UART_SetSync( true ); printf("TWI0\r\n"); while ( 1 ) ; } @@ -374,6 +403,7 @@ */ WEAK void TWI1_IrqHandler( void ) { + UART_SetSync( true ); printf("TWI1\r\n"); while ( 1 ) ; } @@ -383,6 +413,7 @@ */ WEAK void SPI_IrqHandler( void ) { + UART_SetSync( true ); printf("SPI\r\n"); while ( 1 ) ; } @@ -392,6 +423,7 @@ */ WEAK void SSC_IrqHandler( void ) { + UART_SetSync( true ); printf("SSC\r\n"); while ( 1 ) ; } @@ -401,6 +433,7 @@ */ WEAK void TC0_IrqHandler( void ) { + UART_SetSync( true ); printf("TC0\r\n"); while ( 1 ) ; } @@ -410,6 +443,7 @@ */ WEAK void TC1_IrqHandler( void ) { + UART_SetSync( true ); printf("TC1\r\n"); while ( 1 ) ; } @@ -419,6 +453,7 @@ */ WEAK void TC2_IrqHandler( void ) { + UART_SetSync( true ); printf("TC2\r\n"); while ( 1 ) ; } @@ -428,6 +463,7 @@ */ WEAK void TC3_IrqHandler( void ) { + UART_SetSync( true ); printf("TC3\r\n"); while ( 1 ) ; } @@ -437,6 +473,7 @@ */ WEAK void TC4_IrqHandler( void ) { + UART_SetSync( true ); printf("TC4\r\n"); while ( 1 ) ; } @@ -446,6 +483,7 @@ */ WEAK void TC5_IrqHandler( void ) { + UART_SetSync( true ); printf("TC5\r\n"); while ( 1 ) ; } @@ -455,6 +493,7 @@ */ WEAK void ADC_IrqHandler( void ) { + UART_SetSync( true ); printf("ADC\r\n"); while ( 1 ) ; } @@ -464,6 +503,7 @@ */ WEAK void DAC_IrqHandler( void ) { + UART_SetSync( true ); printf("DAC\r\n"); while ( 1 ) ; } @@ -473,6 +513,7 @@ */ WEAK void PWM_IrqHandler( void ) { + UART_SetSync( true ); printf("PWM\r\n"); while ( 1 ) ; } @@ -482,6 +523,7 @@ */ WEAK void CRCCU_IrqHandler( void ) { + UART_SetSync( true ); printf("CRCCU\r\n"); while ( 1 ) ; } @@ -491,6 +533,7 @@ */ WEAK void ACC_IrqHandler( void ) { + UART_SetSync( true ); printf("ACC\r\n"); while ( 1 ) ; } @@ -500,6 +543,7 @@ */ WEAK void USBD_IrqHandler( void ) { + UART_SetSync( true ); printf("USBD\r\n"); while ( 1 ) ; } diff --git a/firmware/libboard/common/include/uart_console.h b/firmware/libboard/common/include/uart_console.h index c0ee3a7..40c9141 100644 --- a/firmware/libboard/common/include/uart_console.h +++ b/firmware/libboard/common/include/uart_console.h @@ -33,12 +33,12 @@ #include extern void UART_Configure( uint32_t dwBaudrate, uint32_t dwMasterClock ) ; -extern void UART_Exit(void) ; +extern void UART_Exit( void ) ; extern void UART_PutChar( uint8_t uc ) ; +extern void UART_SetSync( _Bool sync ) ; extern uint32_t UART_GetChar( void ) ; extern uint32_t UART_IsRxReady( void ) ; - extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize ) ; extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress ) ; extern uint32_t UART_GetInteger( uint32_t* pdwValue ) ; diff --git a/firmware/libboard/common/source/uart_console.c b/firmware/libboard/common/source/uart_console.c index 3ce7331..e936378 100644 --- a/firmware/libboard/common/source/uart_console.c +++ b/firmware/libboard/common/source/uart_console.c @@ -2,6 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2009, Atmel Corporation + * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -57,6 +58,8 @@ static uint8_t _ucIsConsoleInitialized=0; /** Ring buffer to queue data to be sent */ static ringbuf uart_tx_buffer; +/** If UART_PutChar is synchronous (i.e. using blocking polling until character transfer is complete) or asynchronous (i.e. using a buffer and interrupts to complete the transfer). */ +static bool uart_tx_sync = false; /** * \brief Configures an USART peripheral with the specified parameters. @@ -119,6 +122,17 @@ NVIC_DisableIRQ(CONSOLE_IRQ); } +/** + * \brief Set if UART_PutChar is synchronous (i.e. using blocking polling until character transfer is complete) or asynchronous (i.e. using a buffer and interrupts to complete the transfer). + * + * \note Per default the transfer is asynchronous. + * \param sync True for synchronous, false for asynchronous. + */ +void UART_SetSync( _Bool sync ) +{ + uart_tx_sync = sync; +} + /** Interrupt Service routine to transmit queued data */ void CONSOLE_ISR(void) { @@ -148,12 +162,20 @@ UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK); } - /* Only store input if buffer is not full, else drop it */ - if (!rbuf_is_full(&uart_tx_buffer)) { - rbuf_write(&uart_tx_buffer, c); - if (!(pUart->UART_IMR & UART_IMR_TXRDY)) { - pUart->UART_IER = UART_IER_TXRDY; - CONSOLE_ISR(); + /* Send depending on synchronous mode set */ + if (uart_tx_sync) { /* Send the data synchronously (using blocking polling and waiting for the transfer to complete) */ + while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to be empty */ + pUart->UART_THR = c; /* Send data to UART peripheral */ + while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to transferred to shift register */ + while (!(pUart->UART_SR & UART_SR_TXEMPTY)); /* Wait for transfer shift register to be empty (i.e. transfer is complete) */ + } else { /* Send the data asynchronously (using a buffer and interrupts) */ + /* Only store input if buffer is not full, else drop it */ + if (!rbuf_is_full(&uart_tx_buffer)) { + rbuf_write(&uart_tx_buffer, c); + if (!(pUart->UART_IMR & UART_IMR_TXRDY)) { + pUart->UART_IER = UART_IER_TXRDY; + CONSOLE_ISR(); + } } } } -- To view, visit https://gerrit.osmocom.org/10313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad Gerrit-Change-Number: 10313 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:45 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:45 +0000 Subject: Change in simtrace2[master]: cardem: minor typo fix in comment Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10314 Change subject: cardem: minor typo fix in comment ...................................................................... cardem: minor typo fix in comment Change-Id: Ib1dee95e15db1c6bb3b45920d7c1a567e2ba474b --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/14/10314/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index ad6b4d9..fb68660 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -85,7 +85,7 @@ TPDU_S_WAIT_P2, /* waiting for P2 byte from reader */ TPDU_S_WAIT_P3, /* waiting for P3 byte from reader */ TPDU_S_WAIT_PB, /* waiting for Tx of procedure byte */ - TPDU_S_WAIT_RX, /* waiitng for more data from reader */ + TPDU_S_WAIT_RX, /* waiting for more data from reader */ TPDU_S_WAIT_TX, /* waiting for more data to reader */ }; @@ -792,7 +792,7 @@ card_emu_uart_tx(ch->uart_chan, byte); - /* this must happen _after_ the byte has been transmittd */ + /* this must happen _after_ the byte has been transmitted */ switch (ch->tpdu.state) { case TPDU_S_WAIT_PB: /* if we just transmitted the procedure byte, we need to decide -- To view, visit https://gerrit.osmocom.org/10314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1dee95e15db1c6bb3b45920d7c1a567e2ba474b Gerrit-Change-Number: 10314 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:46 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:46 +0000 Subject: Change in simtrace2[master]: cardem (minor): remove to verbose log trace Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10315 Change subject: cardem (minor): remove to verbose log trace ...................................................................... cardem (minor): remove to verbose log trace Change-Id: Ie43a33af3728c0700f71527ca75d909a9ebd2529 --- M firmware/libcommon/source/card_emu.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/15/10315/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index fb68660..14a5dd8 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -360,7 +360,6 @@ if (ch->atr.idx < ch->atr.len) { uint8_t byte = ch->atr.atr[ch->atr.idx++]; card_emu_uart_tx(ch->uart_chan, byte); - TRACE_DEBUG("%u: ATR TX: %02x\n\r", ch->num, byte); return 1; } else { /* The ATR has been completely transmitted */ /* search for TC2 to updated WI */ -- To view, visit https://gerrit.osmocom.org/10315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie43a33af3728c0700f71527ca75d909a9ebd2529 Gerrit-Change-Number: 10315 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:46 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:46 +0000 Subject: Change in simtrace2[master]: cardem: add state name in trace Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10316 Change subject: cardem: add state name in trace ...................................................................... cardem: add state name in trace this helps reading the output while debugging quite a lot Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 --- M firmware/libcommon/source/card_emu.c 1 file changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/16/10316/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 14a5dd8..fac6aef 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -54,6 +54,46 @@ ISO_S_IN_TPDU, /* inside a TPDU */ }; +const struct value_string iso7816_3_card_state_names[] = { + { + .value = ISO_S_WAIT_POWER, + .str = "wait power", + }, + { + .value = ISO_S_WAIT_CLK, + .str = "wait clock", + }, + { + .value = ISO_S_WAIT_RST, + .str = "wait reset", + }, + { + .value = ISO_S_WAIT_ATR, + .str = "wait ATR", + }, + { + .value = ISO_S_IN_ATR, + .str = "in ATR", + }, + { + .value = ISO_S_IN_PTS, + .str = "in PTS", + }, + { + .value = ISO_S_WAIT_TPDU, + .str = "wait TPDU", + }, + { + .value = ISO_S_IN_TPDU, + .str = "in TPDU", + }, + { + .value = 0, + .str = NULL, + }, +}; + + /* detailed sub-states of ISO_S_IN_PTS */ enum pts_state { PTS_S_WAIT_REQ_PTSS, @@ -285,8 +325,9 @@ if (ch->state == new_state) return; - TRACE_DEBUG("%u: 7816 card state %u -> %u\r\n", ch->num, - ch->state, new_state); + TRACE_DEBUG("%u: 7816 card state %u (%s) -> %u (%s)\r\n", ch->num, + ch->state, get_value_string(iso7816_3_card_state_names, ch->state), + new_state, get_value_string(iso7816_3_card_state_names, new_state)); ch->state = new_state; switch (new_state) { -- To view, visit https://gerrit.osmocom.org/10316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 Gerrit-Change-Number: 10316 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:46 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:46 +0000 Subject: Change in simtrace2[master]: add libosmcore utilities Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10317 Change subject: add libosmcore utilities ...................................................................... add libosmcore utilities osmo_hexdump is particularly useful. previously it was only defined, but not implemented. this cause random behaviour upon call, often resulting in memory corruption. Change-Id: Ifd9120fa951f41693903fb657d10826959f1599f --- A firmware/libosmocore/source/utils.c 1 file changed, 632 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/17/10317/1 diff --git a/firmware/libosmocore/source/utils.c b/firmware/libosmocore/source/utils.c new file mode 100644 index 0000000..3096572 --- /dev/null +++ b/firmware/libosmocore/source/utils.c @@ -0,0 +1,632 @@ +/* + * (C) 2011 by Harald Welte + * (C) 2011 by Sylvain Munaut + * (C) 2014 by Nils O. Sel?sdal + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + + +#include +#include +#include +#include +#include +#include + +#include +#include + + +/*! \addtogroup utils + * @{ + * various utility routines + * + * \file utils.c */ + +static char namebuf[255]; + +/*! get human-readable string for given value + * \param[in] vs Array of value_string tuples + * \param[in] val Value to be converted + * \returns pointer to human-readable string + * + * If val is found in vs, the array's string entry is returned. Otherwise, an + * "unknown" string containing the actual value is composed in a static buffer + * that is reused across invocations. + */ +const char *get_value_string(const struct value_string *vs, uint32_t val) +{ + const char *str = get_value_string_or_null(vs, val); + if (str) + return str; + + snprintf(namebuf, sizeof(namebuf), "unknown 0x%"PRIx32, val); + namebuf[sizeof(namebuf) - 1] = '\0'; + return namebuf; +} + +/*! get human-readable string or NULL for given value + * \param[in] vs Array of value_string tuples + * \param[in] val Value to be converted + * \returns pointer to human-readable string or NULL if val is not found + */ +const char *get_value_string_or_null(const struct value_string *vs, + uint32_t val) +{ + int i; + + for (i = 0;; i++) { + if (vs[i].value == 0 && vs[i].str == NULL) + break; + if (vs[i].value == val) + return vs[i].str; + } + + return NULL; +} + +/*! get numeric value for given human-readable string + * \param[in] vs Array of value_string tuples + * \param[in] str human-readable string + * \returns numeric value (>0) or negative numer in case of error + */ +int get_string_value(const struct value_string *vs, const char *str) +{ + int i; + + for (i = 0;; i++) { + if (vs[i].value == 0 && vs[i].str == NULL) + break; + if (!strcasecmp(vs[i].str, str)) + return vs[i].value; + } + return -EINVAL; +} + +/*! Convert BCD-encoded digit into printable character + * \param[in] bcd A single BCD-encoded digit + * \returns single printable character + */ +char osmo_bcd2char(uint8_t bcd) +{ + if (bcd < 0xa) + return '0' + bcd; + else + return 'A' + (bcd - 0xa); +} + +/*! Convert number in ASCII to BCD value + * \param[in] c ASCII character + * \returns BCD encoded value of character + */ +uint8_t osmo_char2bcd(char c) +{ + if (c >= '0' && c <= '9') + return c - 0x30; + else if (c >= 'A' && c <= 'F') + return 0xa + (c - 'A'); + else if (c >= 'a' && c <= 'f') + return 0xa + (c - 'a'); + else + return 0; +} + +/*! Parse a string containing hexadecimal digits + * \param[in] str string containing ASCII encoded hexadecimal digits + * \param[out] b output buffer + * \param[in] max_len maximum space in output buffer + * \returns number of parsed octets, or -1 on error + */ +int osmo_hexparse(const char *str, uint8_t *b, int max_len) + +{ + char c; + uint8_t v; + const char *strpos; + unsigned int nibblepos = 0; + + memset(b, 0x00, max_len); + + for (strpos = str; (c = *strpos); strpos++) { + /* skip whitespace */ + if (c == ' ' || c == '\t' || c == '\n' || c == '\r') + continue; + + /* If the buffer is too small, error out */ + if (nibblepos >= (max_len << 1)) + return -1; + + if (c >= '0' && c <= '9') + v = c - '0'; + else if (c >= 'a' && c <= 'f') + v = 10 + (c - 'a'); + else if (c >= 'A' && c <= 'F') + v = 10 + (c - 'A'); + else + return -1; + + b[nibblepos >> 1] |= v << (nibblepos & 1 ? 0 : 4); + nibblepos ++; + } + + /* In case of uneven amount of digits, the last byte is not complete + * and that's an error. */ + if (nibblepos & 1) + return -1; + + return nibblepos >> 1; +} + +static char hexd_buff[4096]; +static const char hex_chars[] = "0123456789abcdef"; + +static char *_osmo_hexdump(const unsigned char *buf, int len, const char *delim) +{ + int i; + char *cur = hexd_buff; + + hexd_buff[0] = 0; + for (i = 0; i < len; i++) { + const char *delimp = delim; + int len_remain = sizeof(hexd_buff) - (cur - hexd_buff); + if (len_remain < 3) + break; + + *cur++ = hex_chars[buf[i] >> 4]; + *cur++ = hex_chars[buf[i] & 0xf]; + + while (len_remain > 1 && *delimp) { + *cur++ = *delimp++; + len_remain--; + } + + *cur = 0; + } + hexd_buff[sizeof(hexd_buff)-1] = 0; + return hexd_buff; +} + +/*! Convert a sequence of unpacked bits to ASCII string + * \param[in] bits A sequence of unpacked bits + * \param[in] len Length of bits + */ +char *osmo_ubit_dump(const uint8_t *bits, unsigned int len) +{ + int i; + + if (len > sizeof(hexd_buff)-1) + len = sizeof(hexd_buff)-1; + memset(hexd_buff, 0, sizeof(hexd_buff)); + + for (i = 0; i < len; i++) { + char outch; + switch (bits[i]) { + case 0: + outch = '0'; + break; + case 0xff: + outch = '?'; + break; + case 1: + outch = '1'; + break; + default: + outch = 'E'; + break; + } + hexd_buff[i] = outch; + } + hexd_buff[sizeof(hexd_buff)-1] = 0; + return hexd_buff; +} + +/*! Convert binary sequence to hexadecimal ASCII string + * \param[in] buf pointer to sequence of bytes + * \param[in] len length of buf in number of bytes + * \returns pointer to zero-terminated string + * + * This function will print a sequence of bytes as hexadecimal numbers, + * adding one space character between each byte (e.g. "1a ef d9") + * + * The maximum size of the output buffer is 4096 bytes, i.e. the maximum + * number of input bytes that can be printed in one call is 1365! + */ +char *osmo_hexdump(const unsigned char *buf, int len) +{ + return _osmo_hexdump(buf, len, " "); +} + +/*! Convert binary sequence to hexadecimal ASCII string + * \param[in] buf pointer to sequence of bytes + * \param[in] len length of buf in number of bytes + * \returns pointer to zero-terminated string + * + * This function will print a sequence of bytes as hexadecimal numbers, + * without any space character between each byte (e.g. "1aefd9") + * + * The maximum size of the output buffer is 4096 bytes, i.e. the maximum + * number of input bytes that can be printed in one call is 2048! + */ +char *osmo_hexdump_nospc(const unsigned char *buf, int len) +{ + return _osmo_hexdump(buf, len, ""); +} + +/* Compat with previous typo to preserve abi */ +char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len) +#if defined(__MACH__) && defined(__APPLE__) + ; +#else + __attribute__((weak, alias("osmo_hexdump_nospc"))); +#endif + +#include +/*! Convert an entire string to lower case + * \param[out] out output string, caller-allocated + * \param[in] in input string + */ +void osmo_str2lower(char *out, const char *in) +{ + unsigned int i; + + for (i = 0; i < strlen(in); i++) + out[i] = tolower((const unsigned char)in[i]); + out[strlen(in)] = '\0'; +} + +/*! Convert an entire string to upper case + * \param[out] out output string, caller-allocated + * \param[in] in input string + */ +void osmo_str2upper(char *out, const char *in) +{ + unsigned int i; + + for (i = 0; i < strlen(in); i++) + out[i] = toupper((const unsigned char)in[i]); + out[strlen(in)] = '\0'; +} + +/*! Wishful thinking to generate a constant time compare + * \param[in] exp Expected data + * \param[in] rel Comparison value + * \param[in] count Number of bytes to compare + * \returns 1 in case \a exp equals \a rel; zero otherwise + * + * Compare count bytes of exp to rel. Return 0 if they are identical, 1 + * otherwise. Do not return a mismatch on the first mismatching byte, + * but always compare all bytes, regardless. The idea is that the amount of + * matching bytes cannot be inferred from the time the comparison took. */ +int osmo_constant_time_cmp(const uint8_t *exp, const uint8_t *rel, const int count) +{ + int x = 0, i; + + for (i = 0; i < count; ++i) + x |= exp[i] ^ rel[i]; + + /* if x is zero, all data was identical */ + return x? 1 : 0; +} + +/*! Generic retrieval of 1..8 bytes as big-endian uint64_t + * \param[in] data Input data as byte-array + * \param[in] data_len Length of \a data in octets + * \returns uint64_t of \a data interpreted as big-endian + * + * This is like osmo_load64be_ext, except that if data_len is less than + * sizeof(uint64_t), the data is interpreted as the least significant bytes + * (osmo_load64be_ext loads them as the most significant bytes into the + * returned uint64_t). In this way, any integer size up to 64 bits can be + * decoded conveniently by using sizeof(), without the need to call specific + * numbered functions (osmo_load16, 32, ...). */ +uint64_t osmo_decode_big_endian(const uint8_t *data, size_t data_len) +{ + uint64_t value = 0; + + while (data_len > 0) { + value = (value << 8) + *data; + data += 1; + data_len -= 1; + } + + return value; +} + +/*! Generic big-endian encoding of big endian number up to 64bit + * \param[in] value unsigned integer value to be stored + * \param[in] data_len number of octets + * \returns static buffer containing big-endian stored value + * + * This is like osmo_store64be_ext, except that this returns a static buffer of + * the result (for convenience, but not threadsafe). If data_len is less than + * sizeof(uint64_t), only the least significant bytes of value are encoded. */ +uint8_t *osmo_encode_big_endian(uint64_t value, size_t data_len) +{ + static uint8_t buf[sizeof(uint64_t)]; + OSMO_ASSERT(data_len <= ARRAY_SIZE(buf)); + osmo_store64be_ext(value, buf, data_len); + return buf; +} + +/*! Copy a C-string into a sized buffer + * \param[in] src source string + * \param[out] dst destination string + * \param[in] siz size of the \a dst buffer + * \returns length of \a src + * + * Copy at most \a siz bytes from \a src to \a dst, ensuring that the result is + * NUL terminated. The NUL character is included in \a siz, i.e. passing the + * actual sizeof(*dst) is correct. + */ +size_t osmo_strlcpy(char *dst, const char *src, size_t siz) +{ + size_t ret = src ? strlen(src) : 0; + + if (siz) { + size_t len = (ret >= siz) ? siz - 1 : ret; + if (src) + memcpy(dst, src, len); + dst[len] = '\0'; + } + return ret; +} + +/*! Validate that a given string is a hex string within given size limits. + * Note that each hex digit amounts to a nibble, so if checking for a hex + * string to result in N bytes, pass amount of digits as 2*N. + * \param str A nul-terminated string to validate, or NULL. + * \param min_digits least permitted amount of digits. + * \param max_digits most permitted amount of digits. + * \param require_even if true, require an even amount of digits. + * \returns true when the hex_str contains only hexadecimal digits (no + * whitespace) and matches the requested length; also true + * when min_digits <= 0 and str is NULL. + */ +bool osmo_is_hexstr(const char *str, int min_digits, int max_digits, + bool require_even) +{ + int len; + /* Use unsigned char * to avoid a compiler warning of + * "error: array subscript has type 'char' [-Werror=char-subscripts]" */ + const unsigned char *pos = (const unsigned char*)str; + if (!pos) + return min_digits < 1; + for (len = 0; *pos && len < max_digits; len++, pos++) + if (!isxdigit(*pos)) + return false; + if (len < min_digits) + return false; + /* With not too many digits, we should have reached *str == nul */ + if (*pos) + return false; + if (require_even && (len & 1)) + return false; + + return true; +} + +/*! Determine if a given identifier is valid, i.e. doesn't contain illegal chars + * \param[in] str String to validate + * \param[in] sep_chars Permitted separation characters between identifiers. + * \returns true in case \a str contains only valid identifiers and sep_chars, false otherwise + */ +bool osmo_separated_identifiers_valid(const char *str, const char *sep_chars) +{ + /* characters that are illegal in names */ + static const char illegal_chars[] = "., {}[]()<>|~\\^`'\"?=;/+*&%$#!"; + unsigned int i; + size_t len; + + /* an empty string is not a valid identifier */ + if (!str || (len = strlen(str)) == 0) + return false; + + for (i = 0; i < len; i++) { + if (sep_chars && strchr(sep_chars, str[i])) + continue; + /* check for 7-bit ASCII */ + if (str[i] & 0x80) + return false; + if (!isprint((int)str[i])) + return false; + /* check for some explicit reserved control characters */ + if (strchr(illegal_chars, str[i])) + return false; + } + + return true; +} + +/*! Determine if a given identifier is valid, i.e. doesn't contain illegal chars + * \param[in] str String to validate + * \returns true in case \a str contains valid identifier, false otherwise + */ +bool osmo_identifier_valid(const char *str) +{ + return osmo_separated_identifiers_valid(str, NULL); +} + +/*! Return the string with all non-printable characters escaped. + * \param[in] str A string that may contain any characters. + * \param[in] len Pass -1 to print until nul char, or >= 0 to force a length. + * \param[inout] buf string buffer to write escaped characters to. + * \param[in] bufsize size of \a buf. + * \returns buf containing an escaped representation, possibly truncated, or str itself. + */ +const char *osmo_escape_str_buf(const char *str, int in_len, char *buf, size_t bufsize) +{ + int in_pos = 0; + int next_unprintable = 0; + int out_pos = 0; + char *out = buf; + /* -1 to leave space for a final \0 */ + int out_len = bufsize-1; + + if (!str) + return "(null)"; + + if (in_len < 0) + in_len = strlen(str); + + while (in_pos < in_len) { + for (next_unprintable = in_pos; + next_unprintable < in_len && isprint((int)str[next_unprintable]) + && str[next_unprintable] != '"' + && str[next_unprintable] != '\\'; + next_unprintable++); + + if (next_unprintable == in_len + && in_pos == 0) + return str; + + while (in_pos < next_unprintable && out_pos < out_len) + out[out_pos++] = str[in_pos++]; + + if (out_pos == out_len || in_pos == in_len) + goto done; + + switch (str[next_unprintable]) { +#define BACKSLASH_CASE(c, repr) \ + case c: \ + if (out_pos > out_len-2) \ + goto done; \ + out[out_pos++] = '\\'; \ + out[out_pos++] = repr; \ + break + + BACKSLASH_CASE('\n', 'n'); + BACKSLASH_CASE('\r', 'r'); + BACKSLASH_CASE('\t', 't'); + BACKSLASH_CASE('\0', '0'); + BACKSLASH_CASE('\a', 'a'); + BACKSLASH_CASE('\b', 'b'); + BACKSLASH_CASE('\v', 'v'); + BACKSLASH_CASE('\f', 'f'); + BACKSLASH_CASE('\\', '\\'); + BACKSLASH_CASE('"', '"'); +#undef BACKSLASH_CASE + + default: + out_pos += snprintf(&out[out_pos], out_len - out_pos, "\\%u", (unsigned char)str[in_pos]); + if (out_pos > out_len) { + out_pos = out_len; + goto done; + } + break; + } + in_pos ++; + } + +done: + out[out_pos] = '\0'; + return out; +} + +/*! Return the string with all non-printable characters escaped. + * Call osmo_escape_str_buf() with a static buffer. + * \param[in] str A string that may contain any characters. + * \param[in] len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns buf containing an escaped representation, possibly truncated, or str itself. + */ +const char *osmo_escape_str(const char *str, int in_len) +{ + return osmo_escape_str_buf(str, in_len, namebuf, sizeof(namebuf)); +} + +/*! Like osmo_escape_str(), but returns double-quotes around a string, or "NULL" for a NULL string. + * This allows passing any char* value and get its C representation as string. + * \param[in] str A string that may contain any characters. + * \param[in] len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns buf containing an escaped representation, possibly truncated, or str itself. + */ +const char *osmo_quote_str_buf(const char *str, int in_len, char *buf, size_t bufsize) +{ + const char *res; + int l; + if (!str) + return "NULL"; + if (bufsize < 3) + return ""; + buf[0] = '"'; + res = osmo_escape_str_buf(str, in_len, buf + 1, bufsize - 2); + /* if osmo_escape_str_buf() returned the str itself, we need to copy it to buf to be able to + * quote it. */ + if (res == str) { + /* max_len = bufsize - two quotes - nul term */ + int max_len = bufsize - 2 - 1; + if (in_len >= 0) + max_len = OSMO_MIN(in_len, max_len); + /* It is not allowed to pass unterminated strings into osmo_strlcpy() :/ */ + strncpy(buf + 1, str, max_len); + buf[1 + max_len] = '\0'; + } + l = strlen(buf); + buf[l] = '"'; + buf[l+1] = '\0'; /* both osmo_escape_str_buf() and max_len above ensure room for '\0' */ + return buf; +} + +const char *osmo_quote_str(const char *str, int in_len) +{ + return osmo_quote_str_buf(str, in_len, namebuf, sizeof(namebuf)); +} + +/*! perform an integer square root operation on unsigned 32bit integer. + * This implementation is taken from "Hacker's Delight" Figure 11-1 "Integer square root, Newton's + * method", which can also be found at http://www.hackersdelight.org/hdcodetxt/isqrt.c.txt */ +uint32_t osmo_isqrt32(uint32_t x) +{ + uint32_t x1; + int s, g0, g1; + + if (x <= 1) + return x; + + s = 1; + x1 = x - 1; + if (x1 > 0xffff) { + s = s + 8; + x1 = x1 >> 16; + } + if (x1 > 0xff) { + s = s + 4; + x1 = x1 >> 8; + } + if (x1 > 0xf) { + s = s + 2; + x1 = x1 >> 4; + } + if (x1 > 0x3) { + s = s + 1; + } + + g0 = 1 << s; /* g0 = 2**s */ + g1 = (g0 + (x >> s)) >> 1; /* g1 = (g0 + x/g0)/2 */ + + /* converges after four to five divisions for arguments up to 16,785,407 */ + while (g1 < g0) { + g0 = g1; + g1 = (g0 + (x/g0)) >> 1; + } + return g0; +} + +/*! @} */ -- To view, visit https://gerrit.osmocom.org/10317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd9120fa951f41693903fb657d10826959f1599f Gerrit-Change-Number: 10317 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:47 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:47 +0000 Subject: Change in simtrace2[master]: cardem (minor): trace tx data send over USB Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10318 Change subject: cardem (minor): trace tx data send over USB ...................................................................... cardem (minor): trace tx data send over USB Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 --- M firmware/libcommon/source/card_emu.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/18/10318/1 diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index fac6aef..625e880 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -247,6 +247,9 @@ rd = (struct cardemu_usb_msg_rx_data *) msg->l2h; rd->data_len = msgb_l2len(msg) - sizeof(*rd); + TRACE_INFO("%u: %s: %s\n\r", + ch->num, __func__, osmo_hexdump(msg->l2h, rd->data_len)); + usb_buf_upd_len_and_submit(msg); } -- To view, visit https://gerrit.osmocom.org/10318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 Gerrit-Change-Number: 10318 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 15:54:47 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Thu, 2 Aug 2018 15:54:47 +0000 Subject: Change in simtrace2[master]: remsim: fix USB hanging USB transfer Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10319 Change subject: remsim: fix USB hanging USB transfer ...................................................................... remsim: fix USB hanging USB transfer After a couple of seconds of USB data exchange between remsim and cardem, the USB transfer hangs. On host side (remsim) I can see the USB BULK IN request. On device side (cardem) I see that data has been submitted and "sent" over USB, but on wireshark with USBmon I don't see the corresponding USB BULK IN response. When exiting remsim or just after powering of qmod (causing an error in remsim) the USB BULK IN is show in wireshark. Thus it must have been in a buffer, but not read by libusb_bulk_transfer. By shortening the timeout a new libusb_bulk_transfer is made more frequently, and the data gets read successfully. T;his change also fixes the URB data display. Change-Id: I1d124a41cc90893506933f6d76dc7331e52a74f9 --- M host/simtrace2-remsim.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/19/10319/1 diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index 52c5051..9a681b4 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -536,7 +536,7 @@ /* read data from SIMtrace2 device (local or via USB) */ if (transp->udp_fd < 0) { rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in, - buf, sizeof(buf), &xfer_len, 100000); + buf, sizeof(buf), &xfer_len, 100); if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT && rc != LIBUSB_ERROR_INTERRUPTED && rc != LIBUSB_ERROR_IO) { @@ -553,7 +553,7 @@ } /* dispatch any incoming data */ if (xfer_len > 0) { - printf("URB: %s\n", osmo_hexdump(buf, rc)); + printf("URB: %s\n", osmo_hexdump(buf, xfer_len)); process_usb_msg(ci, buf, xfer_len); msg_count++; byte_count += xfer_len; -- To view, visit https://gerrit.osmocom.org/10319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1d124a41cc90893506933f6d76dc7331e52a74f9 Gerrit-Change-Number: 10319 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 16:00:09 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 16:00:09 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10320 Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) ...................................................................... mgcp_sdp: restructure mgcp_write_response_sdp() (audio) The function mgcp_write_response_sdp() is responsible to write the audio port and the list with the supported payload type numbers to the sdp response. At the moment it can only write exactly one payload type number to the response, but in the future we may want to write several payload type numbers to the response. Lets add a function for that so that now. - add add_audio() helper function to add multiple payload type numbers, but keep the functionality as it is for now Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63 Related: OS#3442 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/10320/1 diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 798b3b2..0f68acc 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -304,6 +304,32 @@ return 0; } +/* Add audio string to sdp payload */ +static int add_audio(struct msgb *sdp, int *payload_types, unsigned int payload_types_len, int local_port) +{ + int rc; + unsigned int i; + + if (payload_types_len < 0) + return -EINVAL; + + rc = msgb_printf(sdp, "m=audio %d RTP/AVP", local_port); + if (rc < 0) + return -EINVAL; + + for (i = 0; i < payload_types_len; i++) { + rc = msgb_printf(sdp, " %d", payload_types[i]); + if (rc < 0) + return -EINVAL; + } + + rc = msgb_printf(sdp, "\r\n"); + if (rc < 0) + return -EINVAL; + + return 0; +} + /*! Generate SDP response string. * \param[in] endp trunk endpoint. * \param[in] conn associated rtp connection. @@ -318,6 +344,7 @@ const char *audio_name; int payload_type; int rc; + int payload_types[1]; OSMO_ASSERT(endp); OSMO_ASSERT(conn); @@ -341,8 +368,9 @@ goto buffer_too_small; if (payload_type >= 0) { - rc = msgb_printf(sdp, "m=audio %d RTP/AVP %d\r\n", - conn->end.local_port, payload_type); + + payload_types[0] = payload_type; + rc = add_audio(sdp, payload_types, 1, conn->end.local_port); if (rc < 0) goto buffer_too_small; -- To view, visit https://gerrit.osmocom.org/10320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63 Gerrit-Change-Number: 10320 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 16:00:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 16:00:50 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10310 to look at the new patch set (#2). Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) ...................................................................... mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) The function mgcp_write_response_sdp() generates the rtpmap lines in the sdp response. Since we will likely support multiple codecs we will need to generate several rtpmap lines. Therefore it makes sense to split up that part in a separate function without altering the overall functionality (yet) - add static function add_rtpmap() to generate the rtpmap. Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Related: OS#3442 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/10/10310/2 -- To view, visit https://gerrit.osmocom.org/10310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Gerrit-Change-Number: 10310 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 16:00:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 16:00:50 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10320 ) Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) ...................................................................... mgcp_sdp: restructure mgcp_write_response_sdp() (audio) The function mgcp_write_response_sdp() is responsible to write the audio port and the list with the supported payload type numbers to the sdp response. At the moment it can only write exactly one payload type number to the response, but in the future we may want to write several payload type numbers to the response. Lets add a function for that so that now. - add add_audio() helper function to add multiple payload type numbers, but keep the functionality as it is for now Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63 Related: OS#3442 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 30 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/20/10320/2 -- To view, visit https://gerrit.osmocom.org/10320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63 Gerrit-Change-Number: 10320 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 16:04:55 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 2 Aug 2018 16:04:55 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10310 to look at the new patch set (#3). Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) ...................................................................... mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) The function mgcp_write_response_sdp() generates the rtpmap lines in the sdp response. Since we will likely support multiple codecs we will need to generate several rtpmap lines. Therefore it makes sense to split up that part in a separate function without altering the overall functionality (yet) - add static function add_rtpmap() to generate the rtpmap. Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Related: OS#3442 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/10/10310/3 -- To view, visit https://gerrit.osmocom.org/10310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Gerrit-Change-Number: 10310 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 17:42:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 17:42:43 +0000 Subject: Change in osmo-hlr[master]: USSD/hlr_vty.c: print error if EUSE is not found Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10321 Change subject: USSD/hlr_vty.c: print error if EUSE is not found ...................................................................... USSD/hlr_vty.c: print error if EUSE is not found Change-Id: I18045c5e544a99b2414a6f0268f1343df119b9f3 --- M src/hlr_vty.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/21/10321/1 diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 9532a03..2d9b929 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -193,7 +193,13 @@ USSD_STR "Configure default-route for all USSD to unknown destinations\n" EXT_STR) { - struct hlr_euse *euse = euse_find(g_hlr, argv[0]); + struct hlr_euse *euse; + + euse = euse_find(g_hlr, argv[0]); + if (!euse) { + vty_out(vty, "%% Cannot find EUSE %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } if (g_hlr->euse_default != euse) { vty_out(vty, "Switching default route from %s to %s%s", -- To view, visit https://gerrit.osmocom.org/10321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I18045c5e544a99b2414a6f0268f1343df119b9f3 Gerrit-Change-Number: 10321 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 17:42:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 17:42:44 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: fix: properly print a EUSE / IUSE name Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10322 Change subject: hlr_ussd.c: fix: properly print a EUSE / IUSE name ...................................................................... hlr_ussd.c: fix: properly print a EUSE / IUSE name We need to distinguish between both EUSE and IUSE, and properly print their names. Otherwise, garbage is printed in case of IUSE. Change-Id: I497e7c1fe41279afdb1256ee69e166066a6462bb --- M src/hlr_ussd.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/22/10322/1 diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index f9399d2..7b981bb 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -126,8 +126,10 @@ struct hlr_ussd_route *rt; llist_for_each_entry(rt, &hlr->ussd_routes, list) { if (!strncmp(ussd_code, rt->prefix, strlen(rt->prefix))) { - LOGP(DSS, LOGL_DEBUG, "Found EUSE %s (prefix %s) for USSD Code '%s'\n", - rt->u.euse->name, rt->prefix, ussd_code); + LOGP(DSS, LOGL_DEBUG, "Found %s '%s' (prefix '%s') for USSD " + "Code '%s'\n", rt->is_external ? "EUSE" : "IUSE", + rt->is_external ? rt->u.euse->name : rt->u.iuse->name, + rt->prefix, ussd_code); return rt; } } -- To view, visit https://gerrit.osmocom.org/10322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I497e7c1fe41279afdb1256ee69e166066a6462bb Gerrit-Change-Number: 10322 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 17:42:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 17:42:44 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: avoid using CR and NL in IUSE responses Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10323 Change subject: hlr_ussd.c: avoid using CR and NL in IUSE responses ...................................................................... hlr_ussd.c: avoid using CR and NL in IUSE responses According to GSM TS 03.38, section 6.1.2.1, CR symbol at the end is optional, and moreover libosmogsm encoding API will carry about the bit padding itself. Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee --- M src/hlr_ussd.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/23/10323/1 diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 7b981bb..d8bbcb5 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -297,7 +297,7 @@ if (strlen(subscr.msisdn) == 0) snprintf(buf, sizeof(buf), "You have no MSISDN!"); else - snprintf(buf, sizeof(buf), "Your extension is %s\r", subscr.msisdn); + snprintf(buf, sizeof(buf), "Your extension is %s", subscr.msisdn); ss_tx_ussd_7bit(ss, true, req->invoke_id, buf); break; case -ENOENT: @@ -315,7 +315,7 @@ const struct osmo_gsup_message *gsup, const struct ss_request *req) { char buf[GSM0480_USSD_7BIT_STRING_LEN+1]; - snprintf(buf, sizeof(buf), "Your IMSI is %s!\n", ss->imsi); + snprintf(buf, sizeof(buf), "Your IMSI is %s!", ss->imsi); ss_tx_ussd_7bit(ss, true, req->invoke_id, buf); return 0; } -- To view, visit https://gerrit.osmocom.org/10323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee Gerrit-Change-Number: 10323 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:16:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:16:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10324 Change subject: IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP ...................................................................... IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP Change-Id: I3fdc0f47381d5ba1763197d5f264696f04d0396f --- M library/IPA_Emulation.ttcnpp M library/IPA_Types.ttcn 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/10324/1 diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index a271f2d..b10a983 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -239,7 +239,7 @@ private template IpaCcmRespPart t_IdRespPart(IpaCcmIdTag tag, charstring payload) := { len := 0, /* overwritten by codec */ tag := tag, - data := payload + data := char2oct(payload) & '00'O } private function f_send_IPA_EVT(template ASP_IPA_Event evt) runs on IPA_Emulation_CT { diff --git a/library/IPA_Types.ttcn b/library/IPA_Types.ttcn index 933a3fe..3230329 100644 --- a/library/IPA_Types.ttcn +++ b/library/IPA_Types.ttcn @@ -98,7 +98,7 @@ type record IpaCcmRespPart { uint16_t len, IpaCcmIdTag tag, - charstring data + octetstring data } with { variant (len) "LENGTHTO(data,tag)" } type set of IpaCcmRespPart IpaCcmIdResp; -- To view, visit https://gerrit.osmocom.org/10324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3fdc0f47381d5ba1763197d5f264696f04d0396f Gerrit-Change-Number: 10324 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:21:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:21:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10324 ) Change subject: IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3fdc0f47381d5ba1763197d5f264696f04d0396f Gerrit-Change-Number: 10324 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:21:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:21:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:21:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10324 ) Change subject: IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP ...................................................................... IPA_Emulation: Add missing zero byte to strings in IPA CCM ID RESP Change-Id: I3fdc0f47381d5ba1763197d5f264696f04d0396f --- M library/IPA_Emulation.ttcnpp M library/IPA_Types.ttcn 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index a271f2d..b10a983 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -239,7 +239,7 @@ private template IpaCcmRespPart t_IdRespPart(IpaCcmIdTag tag, charstring payload) := { len := 0, /* overwritten by codec */ tag := tag, - data := payload + data := char2oct(payload) & '00'O } private function f_send_IPA_EVT(template ASP_IPA_Event evt) runs on IPA_Emulation_CT { diff --git a/library/IPA_Types.ttcn b/library/IPA_Types.ttcn index 933a3fe..3230329 100644 --- a/library/IPA_Types.ttcn +++ b/library/IPA_Types.ttcn @@ -98,7 +98,7 @@ type record IpaCcmRespPart { uint16_t len, IpaCcmIdTag tag, - charstring data + octetstring data } with { variant (len) "LENGTHTO(data,tag)" } type set of IpaCcmRespPart IpaCcmIdResp; -- To view, visit https://gerrit.osmocom.org/10324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3fdc0f47381d5ba1763197d5f264696f04d0396f Gerrit-Change-Number: 10324 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:22:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:22:07 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: avoid using CR and NL in IUSE responses In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10323 ) Change subject: hlr_ussd.c: avoid using CR and NL in IUSE responses ...................................................................... Patch Set 1: I actually intentionally added the \n in OsmoHLR as we also had the \n in OsmoMSC before, and I wanted to make sure the messages are identical in both cases, not to break tests e.g. in osmo-gsm-tester. -- To view, visit https://gerrit.osmocom.org/10323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee Gerrit-Change-Number: 10323 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:22:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:22:37 +0000 Subject: Change in osmo-hlr[master]: USSD/hlr_vty.c: print error if EUSE is not found In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10321 ) Change subject: USSD/hlr_vty.c: print error if EUSE is not found ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18045c5e544a99b2414a6f0268f1343df119b9f3 Gerrit-Change-Number: 10321 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:22:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:22:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:22:39 +0000 Subject: Change in osmo-hlr[master]: USSD/hlr_vty.c: print error if EUSE is not found In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10321 ) Change subject: USSD/hlr_vty.c: print error if EUSE is not found ...................................................................... USSD/hlr_vty.c: print error if EUSE is not found Change-Id: I18045c5e544a99b2414a6f0268f1343df119b9f3 --- M src/hlr_vty.c 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 9532a03..2d9b929 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -193,7 +193,13 @@ USSD_STR "Configure default-route for all USSD to unknown destinations\n" EXT_STR) { - struct hlr_euse *euse = euse_find(g_hlr, argv[0]); + struct hlr_euse *euse; + + euse = euse_find(g_hlr, argv[0]); + if (!euse) { + vty_out(vty, "%% Cannot find EUSE %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } if (g_hlr->euse_default != euse) { vty_out(vty, "Switching default route from %s to %s%s", -- To view, visit https://gerrit.osmocom.org/10321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I18045c5e544a99b2414a6f0268f1343df119b9f3 Gerrit-Change-Number: 10321 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:22:57 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: fix: properly print a EUSE / IUSE name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10322 ) Change subject: hlr_ussd.c: fix: properly print a EUSE / IUSE name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I497e7c1fe41279afdb1256ee69e166066a6462bb Gerrit-Change-Number: 10322 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:22:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:23:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:23:01 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: fix: properly print a EUSE / IUSE name In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10322 ) Change subject: hlr_ussd.c: fix: properly print a EUSE / IUSE name ...................................................................... hlr_ussd.c: fix: properly print a EUSE / IUSE name We need to distinguish between both EUSE and IUSE, and properly print their names. Otherwise, garbage is printed in case of IUSE. Change-Id: I497e7c1fe41279afdb1256ee69e166066a6462bb --- M src/hlr_ussd.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index f9399d2..7b981bb 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -126,8 +126,10 @@ struct hlr_ussd_route *rt; llist_for_each_entry(rt, &hlr->ussd_routes, list) { if (!strncmp(ussd_code, rt->prefix, strlen(rt->prefix))) { - LOGP(DSS, LOGL_DEBUG, "Found EUSE %s (prefix %s) for USSD Code '%s'\n", - rt->u.euse->name, rt->prefix, ussd_code); + LOGP(DSS, LOGL_DEBUG, "Found %s '%s' (prefix '%s') for USSD " + "Code '%s'\n", rt->is_external ? "EUSE" : "IUSE", + rt->is_external ? rt->u.euse->name : rt->u.iuse->name, + rt->prefix, ussd_code); return rt; } } -- To view, visit https://gerrit.osmocom.org/10322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I497e7c1fe41279afdb1256ee69e166066a6462bb Gerrit-Change-Number: 10322 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:23:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:23:48 +0000 Subject: Change in simtrace2[master]: cardem: use TC2 as WI and update WT after ATR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10311 ) Change subject: cardem: use TC2 as WI and update WT after ATR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e51b16d557bc664f87563e1a3dce6642de474d2 Gerrit-Change-Number: 10311 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:23:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:24:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:24:11 +0000 Subject: Change in simtrace2[master]: sniff: send incomplete TPDU when reset is asserted In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10312 ) Change subject: sniff: send incomplete TPDU when reset is asserted ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d7e4d604cded535e40d27c2be872268e0f24c20 Gerrit-Change-Number: 10312 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:24:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:25:38 +0000 Subject: Change in simtrace2[master]: cardem: minor typo fix in comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10314 ) Change subject: cardem: minor typo fix in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1dee95e15db1c6bb3b45920d7c1a567e2ba474b Gerrit-Change-Number: 10314 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:25:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:25:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 19:25:50 +0000 Subject: Change in simtrace2[master]: cardem (minor): remove to verbose log trace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10315 ) Change subject: cardem (minor): remove to verbose log trace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie43a33af3728c0700f71527ca75d909a9ebd2529 Gerrit-Change-Number: 10315 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 19:25:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 19:41:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 19:41:06 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: avoid using CR and NL in IUSE responses In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10323 ) Change subject: hlr_ussd.c: avoid using CR and NL in IUSE responses ...................................................................... Patch Set 1: > I actually intentionally added the \n in OsmoHLR as we also had the > \n in OsmoMSC before, and I wanted to make sure the messages are > identical in both cases, not to break tests e.g. in > osmo-gsm-tester. AFAIR, we had exactly '\r' in OsmoMSC (and still have in OpenBSC). At least, it makes sense to replace '\n' by '\r'... -- To view, visit https://gerrit.osmocom.org/10323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee Gerrit-Change-Number: 10323 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 02 Aug 2018 19:41:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 20:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 20:56:12 +0000 Subject: Change in simtrace2[master]: cardem: use TC2 as WI and update WT after ATR In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10311 ) Change subject: cardem: use TC2 as WI and update WT after ATR ...................................................................... cardem: use TC2 as WI and update WT after ATR Change-Id: I3e51b16d557bc664f87563e1a3dce6642de474d2 --- M firmware/libcommon/source/card_emu.c 1 file changed, 33 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 51fd923..ad6b4d9 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -363,11 +363,39 @@ TRACE_DEBUG("%u: ATR TX: %02x\n\r", ch->num, byte); return 1; } else { /* The ATR has been completely transmitted */ - /* TODO update WI using optional TC2 and then update WT */ - //ch->wi = ISO7816_3_DEFAULT_WI; - /* update waiting time */ - //ch->waiting_time = ISO7816_3_INIT_WTIME; - //tc_etu_set_wtime(ch->tc_chan, ch->waiting_time); + /* search for TC2 to updated WI */ + ch->wi = ISO7816_3_DEFAULT_WI; + if (ch->atr.len >= 2 && ch->atr.atr[1] & 0xf0) { /* Y1 has some data */ + uint8_t atr_td1 = 2; + if (ch->atr.atr[1] & 0x10) { /* TA1 is present */ + atr_td1++; + } + if (ch->atr.atr[1] & 0x20) { /* TB1 is present */ + atr_td1++; + } + if (ch->atr.atr[1] & 0x40) { /* TC1 is present */ + atr_td1++; + } + if (ch->atr.atr[1] & 0x80) { /* TD1 is present */ + if (ch->atr.len > atr_td1 && ch->atr.atr[atr_td1] & 0xf0) { /* Y2 has some data */ + uint8_t atr_tc2 = atr_td1+1; + if (ch->atr.atr[atr_td1] & 0x10) { /* TA2 is present */ + atr_tc2++; + } + if (ch->atr.atr[atr_td1] & 0x20) { /* TB2 is present */ + atr_tc2++; + } + if (ch->atr.atr[atr_td1] & 0x40) { /* TC2 is present */ + if (ch->atr.len > atr_tc2 && ch->atr.atr[atr_tc2]) { /* TC2 encodes WI */ + ch->wi = ch->atr.atr[atr_tc2]; /* set WI */ + } + } + } + } + } + /* update waiting time (see ISO 7816-3 10.2) */ + ch->waiting_time = ch->wi * 960 * ch->fi; + tc_etu_set_wtime(ch->tc_chan, ch->waiting_time); /* reset PTS to initial state */ set_pts_state(ch, PTS_S_WAIT_REQ_PTSS); /* go to next state */ -- To view, visit https://gerrit.osmocom.org/10311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3e51b16d557bc664f87563e1a3dce6642de474d2 Gerrit-Change-Number: 10311 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 20:56:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 20:56:13 +0000 Subject: Change in simtrace2[master]: sniff: send incomplete TPDU when reset is asserted In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10312 ) Change subject: sniff: send incomplete TPDU when reset is asserted ...................................................................... sniff: send incomplete TPDU when reset is asserted Change-Id: I8d7e4d604cded535e40d27c2be872268e0f24c20 --- M firmware/libcommon/source/sniffer.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 982653c..3cd0b89 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -1050,6 +1050,23 @@ /* Handle flags */ if (change_flags) { /* WARNING this is not synced with the data buffer handling */ if (change_flags & SNIFF_CHANGE_FLAG_RESET_ASSERT) { + switch (iso_state) { + case ISO7816_S_IN_ATR: + led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ + usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */ + break; + case ISO7816_S_IN_TPDU: + led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ + usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */ + break; + case ISO7816_S_IN_PPS_REQ: + case ISO7816_S_IN_PPS_RSP: + led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */ + usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */ + break; + default: + break; + } if (ISO7816_S_RESET != iso_state) { change_state(ISO7816_S_RESET); printf("reset asserted\n\r"); -- To view, visit https://gerrit.osmocom.org/10312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8d7e4d604cded535e40d27c2be872268e0f24c20 Gerrit-Change-Number: 10312 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 20:56:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 20:56:24 +0000 Subject: Change in simtrace2[master]: cardem: add state name in trace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10316 ) Change subject: cardem: add state name in trace ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10316/1/firmware/libcommon/source/card_emu.c File firmware/libcommon/source/card_emu.c: https://gerrit.osmocom.org/#/c/10316/1/firmware/libcommon/source/card_emu.c at 58 PS1, Line 58: { I would suggest to simply use lines like OSMO_VALUE_STRING(ISO_S_WAIT_POWER) here. IT is easier to write and ensures the printed name reflects the actual enum name of the state. -- To view, visit https://gerrit.osmocom.org/10316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 Gerrit-Change-Number: 10316 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 02 Aug 2018 20:56:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 20:57:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 20:57:36 +0000 Subject: Change in simtrace2[master]: cardem (minor): trace tx data send over USB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10318 ) Change subject: cardem (minor): trace tx data send over USB ...................................................................... Patch Set 1: why are you proposing this change? debug UART band-width is much lower than the SIM card interface, and we are hex-dumping, so it will never be able to keep up? -- To view, visit https://gerrit.osmocom.org/10318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 Gerrit-Change-Number: 10318 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 02 Aug 2018 20:57:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 20:58:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 20:58:21 +0000 Subject: Change in simtrace2[master]: remsim: fix USB hanging USB transfer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10319 ) Change subject: remsim: fix USB hanging USB transfer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d124a41cc90893506933f6d76dc7331e52a74f9 Gerrit-Change-Number: 10319 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 20:58:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 20:59:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 20:59:29 +0000 Subject: Change in simtrace2[master]: add libosmcore utilities In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10317 ) Change subject: add libosmcore utilities ...................................................................... Patch Set 1: Code-Review+2 we can do this, but in the not too distant future I would want to move to linking against a system-wide installed libosmocore.a for arm-none-eabi. This way we don't end up copying code around. -- To view, visit https://gerrit.osmocom.org/10317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifd9120fa951f41693903fb657d10826959f1599f Gerrit-Change-Number: 10317 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 20:59:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 21:01:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 21:01:13 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: prevent NULL-pointer dereference Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10325 Change subject: gsm/gsm0480.c: prevent NULL-pointer dereference ...................................................................... gsm/gsm0480.c: prevent NULL-pointer dereference Change-Id: I444d95941837458b46e581298f76f3a9926c8552 --- M src/gsm/gsm0480.c 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/10325/1 diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 2d2df4a..5b51c75 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -880,7 +880,11 @@ */ struct msgb *gsm0480_gen_return_error(uint8_t invoke_id, uint8_t error_code) { - struct msgb *msg = gsm0480_msgb_alloc_name("TS 04.80 ReturnError"); + struct msgb *msg; + + msg = gsm0480_msgb_alloc_name("TS 04.80 ReturnError"); + if (!msg) + return NULL; /* First insert the problem code */ msgb_push_TLV1(msg, GSM_0480_ERROR_CODE_TAG, error_code); @@ -906,7 +910,11 @@ */ struct msgb *gsm0480_gen_reject(int invoke_id, uint8_t problem_tag, uint8_t problem_code) { - struct msgb *msg = gsm0480_msgb_alloc_name("TS 04.80 Reject"); + struct msgb *msg; + + msg = gsm0480_msgb_alloc_name("TS 04.80 Reject"); + if (!msg) + return NULL; /* First insert the problem code */ msgb_push_TLV1(msg, problem_tag, problem_code); -- To view, visit https://gerrit.osmocom.org/10325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I444d95941837458b46e581298f76f3a9926c8552 Gerrit-Change-Number: 10325 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 21:01:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 21:01:14 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: use the local msgb allocator Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10326 Change subject: gsm/gsm0480.c: use the local msgb allocator ...................................................................... gsm/gsm0480.c: use the local msgb allocator Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b --- M src/gsm/gsm0480.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/10326/1 diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 5b51c75..3897743 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -125,13 +125,18 @@ return 0; } +struct msgb *gsm0480_msgb_alloc_name(const char *name) +{ + return msgb_alloc_headroom(1024, 128, name); +} + struct msgb *gsm0480_create_unstructuredSS_Notify(int alertPattern, const char *text) { struct msgb *msg; uint8_t *seq_len_ptr, *ussd_len_ptr, *data; int len; - msg = msgb_alloc_headroom(1024, 128, "GSM 04.80"); + msg = gsm0480_msgb_alloc_name("TS 04.80 USSD Notify"); if (!msg) return NULL; @@ -177,7 +182,7 @@ if (len < 1 || len > 160) return NULL; - msg = msgb_alloc_headroom(1024, 128, "GSM 04.80"); + msg = gsm0480_msgb_alloc_name("TS 04.80 NotifySS"); if (!msg) return NULL; @@ -796,11 +801,6 @@ return rc; } -struct msgb *gsm0480_msgb_alloc_name(const char *name) -{ - return msgb_alloc_headroom(1024, 128, name); -} - /*! Generate a USSD ReturnResult component containing a string in default GSM alphabet. * \param[in] invoke_id InvokeID of the request to which we respond * \param[in] text USSD text in ASCII; to be encoded as GSM 7-but alphabet @@ -962,7 +962,7 @@ { struct msgb *msg; - msg = msgb_alloc_headroom(1024, 128, "GSM 04.80 USSD REL COMPL"); + msg = gsm0480_msgb_alloc_name("TS 04.80 USSD REL COMPL"); if (!msg) return NULL; -- To view, visit https://gerrit.osmocom.org/10326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b Gerrit-Change-Number: 10326 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 21:13:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 21:13:24 +0000 Subject: Change in simtrace2[master]: add synchronous UART transmission and use it in exceptions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10313 ) Change subject: add synchronous UART transmission and use it in exceptions ...................................................................... Patch Set 1: Code-Review+1 (1 comment) I think in general I would have preferred to simply use a separate Uart transmit function from the hardirq handlers. Either by explicitly changing those calls away from printf, or by catching/redirecting printf using a #define that's #included only in the exceptions.c file in order to bypass normal printf(). Now we have one conditional in every printf (not really relevant) and some global state that we'd have to switch back should we ever want to have "non-final" exception handling. Another idea that just comes to my mind: Couldn't we simply check some CPU status flags to know that we're in an exception or in an interrupt? This way the decision to bypass the ring buffer could be entirely automatic without any explcit calls to disable the buffer, or any of the hacks I described above? I would suggest to look into this. If it turns out it's not that simple, please report back and we can merge your current patch as-is. https://gerrit.osmocom.org/#/c/10313/1/firmware/libboard/common/source/uart_console.c File firmware/libboard/common/source/uart_console.c: https://gerrit.osmocom.org/#/c/10313/1/firmware/libboard/common/source/uart_console.c at 169 PS1, Line 169: hift register */ : while (!(pUart->UART_SR & UART_SR_TXEMPTY)); /* Wait for transfer shift register to be empty (i.e. transfer is complete) */ why do we wait for this? IMHO this effectively disables the "1 byte fifo" of the transfer register? Shouldn't it be safe to transmit the next byte as soon as the hold register has been transferred to the shift register? -- To view, visit https://gerrit.osmocom.org/10313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad Gerrit-Change-Number: 10313 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 21:13:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 21:25:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 2 Aug 2018 21:25:16 +0000 Subject: Change in simtrace2[master]: add synchronous UART transmission and use it in exceptions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10313 ) Change subject: add synchronous UART transmission and use it in exceptions ...................................................................... Patch Set 1: the ISR_NUMBER field in IPSR will tell us which current interrupt/exception is in use. "0" is normal process mode, so a check for != 0 would bypass the ring buffer in any irq/exception context. If you just want specific faults, you have to check for specific numbers. -- To view, visit https://gerrit.osmocom.org/10313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad Gerrit-Change-Number: 10313 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 02 Aug 2018 21:25:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 21:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 21:49:17 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: clean up the local GSM 04.80 API Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10327 Change subject: libmsc/gsm_09_11.c: clean up the local GSM 04.80 API ...................................................................... libmsc/gsm_09_11.c: clean up the local GSM 04.80 API Since we don't process SS/USSD requests in OsmoMSC anymore, there are some useless GSM 04.80 functions remained from the past. In particular, this change does the following: - removes both gsm0480_send_{ussd_response|return_error} functions because they are not used anymore; - changes symbol prefix from 'gsm0480_' to 'msc_', in order to avoid possible conflicts with the libosmogsm's GSM 04.80 API; - cleans up useless includes; Change-Id: I2990d8627bce0ce6afb1dcf6b11bb194292380d3 --- M include/osmocom/msc/gsm_04_80.h M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c 3 files changed, 13 insertions(+), 149 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/10327/1 diff --git a/include/osmocom/msc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h index 7d63088..c448c91 100644 --- a/include/osmocom/msc/gsm_04_80.h +++ b/include/osmocom/msc/gsm_04_80.h @@ -1,18 +1,10 @@ #pragma once -#include -#include -#include +#include struct gsm_subscriber_connection; -int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, - const char *response_text); -int gsm0480_send_ussd_return_error(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, - uint8_t error_code); -int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, +int msc_send_ussd_reject(struct gsm_subscriber_connection *conn, uint8_t transaction_id, int invoke_id, uint8_t problem_tag, uint8_t problem_code); diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index 32e8e23..0adf059 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -22,20 +22,14 @@ * */ - -#include -#include -#include +#include #include -#include -#include -#include #include #include +#include #include -#include #include #include @@ -48,120 +42,6 @@ return data; } -static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, - uint8_t value) -{ - uint8_t *data = msgb_push(msgb, 3); - - data[0] = tag; - data[1] = 1; - data[2] = value; - return data; -} - -static inline unsigned char *msgb_push_NULL(struct msgb *msgb) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = ASN1_NULL_TYPE_TAG; - data[1] = 0; - return data; -} - - -/*! Send a MT RELEASE COMPLETE message with USSD-response, - * wrapped into the ReturnResult component (see section 3.6.1). - * - * \param[in] conn Active subscriber connection - * \param[in] transaction_id Transaction ID with TI flag set - * \param[in] invoke_id InvokeID of the request - * \param[in] response_text The response text - * \return result of \ref msc_tx_dtap - */ -int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, - const char *response_text) -{ - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD RSP"); - struct gsm48_hdr *gh; - uint8_t *ptr8; - int response_len; - - /* First put the payload text into the message */ - ptr8 = msgb_put(msg, 0); - gsm_7bit_encode_n_ussd(ptr8, msgb_tailroom(msg), response_text, &response_len); - msgb_put(msg, response_len); - - /* Then wrap it as an Octet String */ - msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); - - /* Pre-pend the DCS octet string */ - msgb_push_TLV1(msg, ASN1_OCTET_STRING_TAG, 0x0F); - - /* Then wrap these as a Sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); - - /* Pre-pend the operation code */ - msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, - GSM0480_OP_CODE_PROCESS_USS_REQ); - - /* Wrap the operation code and IA5 string as a sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); - - /* Pre-pend the invoke ID */ - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); - - /* Wrap this up as a Return Result component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); - - /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); - - /* And finally pre-pend the L3 header */ - gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); - gh->proto_discr = GSM48_PDISC_NC_SS; - gh->proto_discr |= transaction_id << 4; - gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; - - return msc_tx_dtap(conn, msg); -} - -/*! Send a MT RELEASE COMPLETE message with ReturnError component - * (see section 3.6.1) and given error code (see section 3.6.6). - * - * \param[in] conn Active subscriber connection - * \param[in] transaction_id Transaction ID with TI flag set - * \param[in] invoke_id InvokeID of the request - * \param[in] error_code Error code (section 4.5) - * \return result of \ref msc_tx_dtap - */ -int gsm0480_send_ussd_return_error(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, uint8_t error_code) -{ - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD ERR"); - struct gsm48_hdr *gh; - - /* First insert the problem code */ - msgb_push_TLV1(msg, GSM_0480_ERROR_CODE_TAG, error_code); - - /* Before it insert the invoke ID */ - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); - - /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR); - - /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); - - /* And finally pre-pend the L3 header */ - gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); - gh->proto_discr = GSM48_PDISC_NC_SS; - gh->proto_discr |= transaction_id << 4; - gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; - - return msc_tx_dtap(conn, msg); -} - /*! Send a MT RELEASE COMPLETE message with Reject component * (see section 3.6.1) and given error code (see section 3.6.7). * @@ -176,27 +56,16 @@ * failed, any incorrect value can be passed (0x00 > x > 0xff), so * the universal NULL-tag (see table 3.6) will be used instead. */ -int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, +int msc_send_ussd_reject(struct gsm_subscriber_connection *conn, uint8_t transaction_id, int invoke_id, uint8_t problem_tag, uint8_t problem_code) { - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REJ"); struct gsm48_hdr *gh; + struct msgb *msg; - /* First insert the problem code */ - msgb_push_TLV1(msg, problem_tag, problem_code); - - /** - * If the Invoke ID is not available, Universal Null - * (table 3.9) with length = 0 shall be used. - */ - if (invoke_id < 0 || invoke_id > 255) - msgb_push_NULL(msg); - else - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); - - /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); + msg = gsm0480_gen_reject(invoke_id, problem_tag, problem_code); + if (!msg) + return -1; /* Wrap the component in a Facility message */ msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 9b0a9e4..01389af 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -34,6 +34,9 @@ #include #include #include + +#include +#include #include #include @@ -200,7 +203,7 @@ error: /* Abort transaction on DTAP-interface */ - gsm0480_send_ussd_reject(conn, tid, -1, + msc_send_ussd_reject(conn, tid, -1, GSM_0480_PROBLEM_CODE_TAG_GENERAL, GSM_0480_GEN_PROB_CODE_UNRECOGNISED); if (trans) -- To view, visit https://gerrit.osmocom.org/10327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2990d8627bce0ce6afb1dcf6b11bb194292380d3 Gerrit-Change-Number: 10327 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 2 22:53:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 2 Aug 2018 22:53:55 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10328 Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... libosmogsm: (re)introduce gsm48_push_l3hdr() There was gsm0480_l3hdr_push() which was declared in a header, but was not exposed in 'libosmogsm.map'. Also, for some reason it was a part of GSM 04.80 API, what is not actually correct. Let's rename this symbol, and properly expose it as a part of the new GSM 04.08 auxiliary API, i.e. in a separate header. Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda --- M include/Makefile.am M include/osmocom/gsm/gsm0480.h A include/osmocom/gsm/gsm48_utils.h M src/gsm/Makefile.am M src/gsm/gsm0411_utils.c M src/gsm/gsm0480.c A src/gsm/gsm48_utils.c M src/gsm/libosmogsm.map 8 files changed, 84 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/10328/1 diff --git a/include/Makefile.am b/include/Makefile.am index ef8ec65..cc29ca8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -90,6 +90,7 @@ osmocom/gsm/gsm23003.h \ osmocom/gsm/gsm48.h \ osmocom/gsm/gsm48_ie.h \ + osmocom/gsm/gsm48_utils.h \ osmocom/gsm/gsm_utils.h \ osmocom/gsm/gsup.h \ osmocom/gsm/ipa.h \ diff --git a/include/osmocom/gsm/gsm0480.h b/include/osmocom/gsm/gsm0480.h index 246f4b3..827464e 100644 --- a/include/osmocom/gsm/gsm0480.h +++ b/include/osmocom/gsm/gsm0480.h @@ -121,6 +121,3 @@ int gsm0480_wrap_invoke(struct msgb *msg, int op, int link_id); int gsm0480_wrap_facility(struct msgb *msg); - -struct gsm48_hdr *gsm0480_l3hdr_push(struct msgb *msg, uint8_t proto_discr, - uint8_t msg_type); diff --git a/include/osmocom/gsm/gsm48_utils.h b/include/osmocom/gsm/gsm48_utils.h new file mode 100644 index 0000000..0f19a0c --- /dev/null +++ b/include/osmocom/gsm/gsm48_utils.h @@ -0,0 +1,5 @@ +#pragma once + +struct gsm48_hdr *gsm48_push_l3hdr(struct msgb *msg, + uint8_t pdisc, uint8_t tid, + uint8_t msg_type); diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 29299a6..a945c1e 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -21,7 +21,7 @@ BUILT_SOURCES = gsm0503_conv.c libgsmint_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ - gsm_utils.c rsl.c gsm48.c gsm48_ie.c gsm0808.c sysinfo.c \ + gsm_utils.c rsl.c gsm48.c gsm48_ie.c gsm48_utils.c gsm0808.c sysinfo.c \ gprs_cipher_core.c gprs_rlc.c gsm0480.c abis_nm.c gsm0502.c \ gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c gsm0414.c \ lapd_core.c lapdm.c kasumi.c gsm_04_08_gprs.c \ diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index 53d37a4..6384900 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include @@ -354,7 +354,7 @@ uint8_t msg_type) { /* Outgoing proto_discr needs the highest bit set */ - gsm0480_l3hdr_push(msg, proto | (trans << 4), msg_type); + gsm48_push_l3hdr(msg, proto, trans, msg_type); return 0; } diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 3897743..ea39980 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -26,6 +26,7 @@ */ #include +#include #include #include @@ -863,10 +864,10 @@ msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ - gsm0480_l3hdr_push(msg, - GSM48_PDISC_NC_SS | trans_id - | (1<<7) /* TI direction = 1 */, - GSM0480_MTYPE_RELEASE_COMPLETE); + gsm48_push_l3hdr(msg, GSM48_PDISC_NC_SS, + trans_id | (1 << 7), /* FIXME: TI direction is always 1 ?!? */ + GSM0480_MTYPE_RELEASE_COMPLETE); + return msg; } @@ -932,17 +933,6 @@ return msg; } - -struct gsm48_hdr *gsm0480_l3hdr_push(struct msgb *msg, uint8_t proto_discr, - uint8_t msg_type) -{ - struct gsm48_hdr *gh; - gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); - gh->proto_discr = proto_discr; - gh->msg_type = msg_type; - return gh; -} - struct msgb *gsm0480_create_ussd_notify(int level, const char *text) { struct msgb *msg; @@ -954,7 +944,11 @@ gsm0480_wrap_invoke(msg, GSM0480_OP_CODE_USS_NOTIFY, 0); gsm0480_wrap_facility(msg); - gsm0480_l3hdr_push(msg, GSM48_PDISC_NC_SS, GSM0480_MTYPE_REGISTER); + /* And finally pre-pend the L3 header */ + gsm48_push_l3hdr(msg, GSM48_PDISC_NC_SS, + 0x00, /* FIXME: no transactionID?!? */ + GSM0480_MTYPE_REGISTER); + return msg; } @@ -966,8 +960,10 @@ if (!msg) return NULL; - /* FIXME: should this set trans_id and TI direction flag? */ - gsm0480_l3hdr_push(msg, GSM48_PDISC_NC_SS, - GSM0480_MTYPE_RELEASE_COMPLETE); + /* And finally pre-pend the L3 header */ + gsm48_push_l3hdr(msg, GSM48_PDISC_NC_SS, + 0x00, /* FIXME: no transactionID?!? */ + GSM0480_MTYPE_RELEASE_COMPLETE); + return msg; } diff --git a/src/gsm/gsm48_utils.c b/src/gsm/gsm48_utils.c new file mode 100644 index 0000000..f2a166e --- /dev/null +++ b/src/gsm/gsm48_utils.c @@ -0,0 +1,58 @@ +/*! \file gsm0408_utils.c + * Auxiliary utilities for GSM TS 04.08 messages */ +/* + * (C) 2016 by Neels Hofmeyr + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include + +#include + +#include +#include + +/*! \addtogroup gsm0408_utils + * @{ + * GSM TS 04.08 auxiliary utilities + */ + +/*! Wrap a given \ref msg with \ref gsm48_hdr structure. + * \param[out] msg A message to be wrapped + * \param[in] pdisc GSM TS 04.07 protocol discriminator + * \param[in] tid GSM TS 04.07 transaction identifier + * \param[in] msg_type GSM TS 04.08 message type + * @return pointer to pushed header within \ref msg + */ +struct gsm48_hdr *gsm48_push_l3hdr(struct msgb *msg, + uint8_t pdisc, uint8_t tid, + uint8_t msg_type) +{ + struct gsm48_hdr *gh; + + gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); + gh->proto_discr = pdisc | (tid << 4); + gh->msg_type = msg_type; + + return gh; +} + +/*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 2bb9d97..ca53c8c 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -323,6 +323,8 @@ gsm48_pdisc_msgtype_name; gsm48_reject_value_names; +gsm48_push_l3hdr; + gsm_7bit_decode; gsm_7bit_decode_ussd; gsm_7bit_encode; -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 10:25:29 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Aug 2018 10:25:29 +0000 Subject: Change in osmo-mgw[master]: network: do not patch PT of RTCP packets Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10329 Change subject: network: do not patch PT of RTCP packets ...................................................................... network: do not patch PT of RTCP packets At the moment all packets that are sent with mgcp_send are fed into mgcp_patch_pt(). This functions corrects the payload type so that it matches the codec configuration on the egress side. However, this functions is only to be used with RTP packets and must not be used on RTCP packets, which we currently do because we do not check if the packet is RTCP or RTP. - Check if the packet is RTP before running mgcp_patch_pt() Change-Id: I55b8aa830e4e23f991373470bd04d4db12241c56 Related: OS#3444 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/29/10329/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 1b1867a..6dfc5a5 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -717,11 +717,13 @@ * course unable to patch the payload type. A situation like this * should not occur if transcoding is consequently avoided. Until * we have transcoding support in osmo-mgw we can not resolve this. */ - rc = mgcp_patch_pt(conn_src, conn_dst, buf, len); - if (rc < 0) { - LOGP(DRTP, LOGL_ERROR, - "endpoint:0x%x can not patch PT because no suitable egress codec was found.\n", - ENDPOINT_NUMBER(endp)); + if (is_rtp) { + rc = mgcp_patch_pt(conn_src, conn_dst, buf, len); + if (rc < 0) { + LOGP(DRTP, LOGL_ERROR, + "endpoint:0x%x can not patch PT because no suitable egress codec was found.\n", + ENDPOINT_NUMBER(endp)); + } } /* Note: In case of loopback configuration, both, the source and the -- To view, visit https://gerrit.osmocom.org/10329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I55b8aa830e4e23f991373470bd04d4db12241c56 Gerrit-Change-Number: 10329 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 10:25:29 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Aug 2018 10:25:29 +0000 Subject: Change in osmo-mgw[master]: network: check packets before further processing Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10330 Change subject: network: check packets before further processing ...................................................................... network: check packets before further processing When we receive a packet, we do not really check the contents. However, we should at least do some basic checks. - Check for short RTP packets - Check if the length field of RTCP packets seems plausible - Check if the packet type of RTCP packets makes sense (IANA) Change-Id: Id47b9eee2164c542e6b673db24974859dd0a7618 Related: OS#3444 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/10330/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6dfc5a5..427f3c6 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -939,6 +940,53 @@ return 0; } +/* Do some basic checks to make sure that the RTCP packets we are going to + * process are not complete garbage */ +static int check_rtcp(char *buf, unsigned int buf_size) +{ + struct rtcp_hdr *hdr; + unsigned int len; + uint8_t type; + + /* RTPC packets that are just a header without data do not make + * any sense. */ + if (buf_size < sizeof(struct rtcp_hdr)) + return -EINVAL; + + /* Make sure that the length of the received packet does not exceed + * the available buffer size */ + hdr = (struct rtcp_hdr *)buf; + len = (osmo_ntohs(hdr->length) + 1) * 4; + if (len > buf_size) + return -EINVAL; + + /* Make sure we accept only packets that have a proper packet type set + * See also: http://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */ + type = hdr->type; + if ((type < 192 || type > 195) && (type < 200 || type > 213)) + return -EINVAL; + + return 0; +} + +/* Do some basic checks to make sure that the RTP packets we are going to + * process are not complete garbage */ +static int check_rtp(char *buf, unsigned int buf_size) +{ + /* RTP packets that are just a header without data do not make + * any sense. */ + if (buf_size < sizeof(struct rtp_hdr)) + return -EINVAL; + + /* FIXME: Add more checks, the reason why we do not check more than + * the length is because we currently handle IUUP packets as RTP + * packets, so they must pass this check, if we weould be more + * strict here, we would possibly break 3G. (see also FIXME note + * below */ + + return 0; +} + /* Receive RTP data from a specified source connection and dispatch it to a * destination connection. */ static int mgcp_recv(int *proto, struct sockaddr_in *addr, char *buf, @@ -959,8 +1007,29 @@ rc = receive_from(endp, fd->fd, addr, buf, buf_size); if (rc <= 0) return -1; + + /* FIXME: The way how we detect the protocol looks odd. We should look + * into the packet header. Also we should introduce a packet type + * MGCP_PROTO_IUUP because currently we handle IUUP packets like RTP + * packets which is problematic. */ *proto = fd == &conn->end.rtp ? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; + if (*proto == MGCP_PROTO_RTP) { + if (check_rtp(buf, rc) < 0) { + LOGP(DRTP, LOGL_ERROR, + "endpoint:0x%x invalid RTP packet received -- packet tossed\n", + ENDPOINT_NUMBER(endp)); + return -1; + } + } else if (*proto == MGCP_PROTO_RTCP) { + if (check_rtcp(buf, rc) < 0) { + LOGP(DRTP, LOGL_ERROR, + "endpoint:0x%x invalid RTCP packet received -- packet tossed\n", + ENDPOINT_NUMBER(endp)); + return -1; + } + } + LOGP(DRTP, LOGL_DEBUG, "endpoint:0x%x ", ENDPOINT_NUMBER(endp)); LOGPC(DRTP, LOGL_DEBUG, "receiving from %s %s %d\n", conn->conn->name, inet_ntoa(addr->sin_addr), -- To view, visit https://gerrit.osmocom.org/10330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id47b9eee2164c542e6b673db24974859dd0a7618 Gerrit-Change-Number: 10330 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 10:25:29 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Aug 2018 10:25:29 +0000 Subject: Change in osmo-mgw[master]: Cosmetic: remove misplaced line break Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10331 Change subject: Cosmetic: remove misplaced line break ...................................................................... Cosmetic: remove misplaced line break Change-Id: I7eea5454cb0567a4a162fb9796f889b2daa21af7 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/31/10331/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 427f3c6..c85a11d 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1221,7 +1221,6 @@ /* Check if the connection is in loopback mode, if yes, just send the * incoming data back to the origin */ - if (conn_src->conn->mode == MGCP_CONN_LOOPBACK) { /* When we are in loopback mode, we loop back all incoming * packets back to their origin. We will use the originating -- To view, visit https://gerrit.osmocom.org/10331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7eea5454cb0567a4a162fb9796f889b2daa21af7 Gerrit-Change-Number: 10331 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 13:54:54 2018 From: gerrit-no-reply at lists.osmocom.org (Mykola Shchetinin) Date: Fri, 3 Aug 2018 13:54:54 +0000 Subject: Change in libosmocore[master]: vty/vty.c: fix bug in vty_config_write Message-ID: Mykola Shchetinin has uploaded this change for review. ( https://gerrit.osmocom.org/10332 Change subject: vty/vty.c: fix bug in vty_config_write ...................................................................... vty/vty.c: fix bug in vty_config_write the vty_config_write function should write: line vty login to the configuration file when the login is enabled. Otherwise after saving the configuration the next login will be performed without password checking (password_check variable will be 0 though it must be 1) Change-Id: I39050b6bf617dac10d3fccc3106f67bdcca1d05a --- M src/vty/vty.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/10332/1 diff --git a/src/vty/vty.c b/src/vty/vty.c index aab0607..ad53537 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1694,6 +1694,8 @@ /* login */ if (!password_check) vty_out(vty, " no login%s", VTY_NEWLINE); + else + vty_out(vty, " login%s", VTY_NEWLINE); /* bind */ if (vty_bind_addr && (strcmp(vty_bind_addr, VTY_BIND_ADDR_DEFAULT) != 0)) -- To view, visit https://gerrit.osmocom.org/10332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39050b6bf617dac10d3fccc3106f67bdcca1d05a Gerrit-Change-Number: 10332 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 14:22:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Aug 2018 14:22:18 +0000 Subject: Change in osmo-bsc[master]: GSCON: avoid sending clear when not connected Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10333 Change subject: GSCON: avoid sending clear when not connected ...................................................................... GSCON: avoid sending clear when not connected The function gscon_lchan_releasing() may be called randomly by any other entity. It then sets the FSM state to ST_CLEARING and sends a BSSMAP CLEAR REQUEST by using gscon_bssmap_clear() Normally gscon_bssmap_clear() protects against sending connection oriented data when no connection is present. This is done by checking if the FSM state is ST_INIT or ST_WAIT_CC. If yes, then nothing is sent. Now gscon_lchan_releasing() defeats this check by first setting the FSM to ST_CLEARING and then trying to send. This causes osmo_bsc_sigtran_send() to be called and the assertion OSMO_ASSERT(conn->sccp.msc); blows because we never had a connection so sccp.msc is unpopulated. We have the possibility to get around the problem by first checking if we are in ST_CLEARING. If yes, we do nothing. If not we still must be in ST_INIT when we never had a connection before. So we may call on_bssmap_clear() without any problem and then set the state to ST_CLEARING. OS#3446 Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/10333/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 81fe9f6..bc7539b 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -627,9 +627,10 @@ conn->lchan = NULL; } if (!conn->lchan) { - if (conn->fi->state != ST_CLEARING) + if (conn->fi->state != ST_CLEARING) { + gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, 999); - gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); + } } } -- To view, visit https://gerrit.osmocom.org/10333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Gerrit-Change-Number: 10333 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 15:07:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 3 Aug 2018 15:07:17 +0000 Subject: Change in osmo-bsc[master]: GSCON: fix segfault after gscon timout Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10334 Change subject: GSCON: fix segfault after gscon timout ...................................................................... GSCON: fix segfault after gscon timout The gscon timeout callback function gscon_timer_cb() may call a_reset_conn_fail(). When doing so it dereferences conn->sccp.msc. However, there may be situations where sccp.msc is not populated. This is the case when the subscriber connection is just created but no SCCP connection is present yet. For example, When the connection between BSC and MSC is down, then we never get an SCCP connection and the timeout function executes. Then the call to a_reset_conn_fail() leads into a null pointer dereference. - Check if conn->sccp.msc is populated before calling a_reset_conn_fail() Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Related: OS#3447 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/10334/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index bc7539b..20cd53a 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -784,7 +784,8 @@ * disconnected. */ LOGPFSML(fi, LOGL_ERROR, "Long after a BSSMAP Clear Command, the conn is still not" " released. For sanity, discarding this conn now.\n"); - a_reset_conn_fail(conn->sccp.msc->a.reset_fsm); + if (conn->sccp.msc) + a_reset_conn_fail(conn->sccp.msc->a.reset_fsm); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); break; default: -- To view, visit https://gerrit.osmocom.org/10334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Gerrit-Change-Number: 10334 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 16:17:39 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 16:17:39 +0000 Subject: Change in libosmocore[master]: vty/vty.c: fix bug in vty_config_write In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10332 ) Change subject: vty/vty.c: fix bug in vty_config_write ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39050b6bf617dac10d3fccc3106f67bdcca1d05a Gerrit-Change-Number: 10332 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 03 Aug 2018 16:17:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 18:55:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 18:55:22 +0000 Subject: Change in osmo-msc[master]: msc/signal.h: use #pragma once include guard Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10335 Change subject: msc/signal.h: use #pragma once include guard ...................................................................... msc/signal.h: use #pragma once include guard Change-Id: I114026808abeff72a3f4f3cb1b84680c116409d4 --- M include/osmocom/msc/signal.h 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/10335/1 diff --git a/include/osmocom/msc/signal.h b/include/osmocom/msc/signal.h index e854a64..f630b27 100644 --- a/include/osmocom/msc/signal.h +++ b/include/osmocom/msc/signal.h @@ -19,8 +19,7 @@ * */ -#ifndef OPENBSC_SIGNAL_H -#define OPENBSC_SIGNAL_H +#pragma once #include #include @@ -99,5 +98,3 @@ /* int paging result. Only the ones with > 0 */ int paging_result; }; - -#endif -- To view, visit https://gerrit.osmocom.org/10335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I114026808abeff72a3f4f3cb1b84680c116409d4 Gerrit-Change-Number: 10335 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 18:55:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 18:55:22 +0000 Subject: Change in osmo-msc[master]: msc/rrlp.h: use #pragma once include guard Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10336 Change subject: msc/rrlp.h: use #pragma once include guard ...................................................................... msc/rrlp.h: use #pragma once include guard Change-Id: Ie68b2092a0a9ceae3519ab9059ac2c1e3d8d7450 --- M include/osmocom/msc/rrlp.h 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/10336/1 diff --git a/include/osmocom/msc/rrlp.h b/include/osmocom/msc/rrlp.h index c89402a..5071a7f 100644 --- a/include/osmocom/msc/rrlp.h +++ b/include/osmocom/msc/rrlp.h @@ -1,7 +1,3 @@ -#ifndef _RRLP_H -#define _RRLP_H +#pragma once void on_dso_load_rrlp(void); - -#endif /* _RRLP_H */ - -- To view, visit https://gerrit.osmocom.org/10336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie68b2092a0a9ceae3519ab9059ac2c1e3d8d7450 Gerrit-Change-Number: 10336 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 18:55:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 18:55:22 +0000 Subject: Change in osmo-msc[master]: libmsc/rrlp.c: add missing include Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10337 Change subject: libmsc/rrlp.c: add missing include ...................................................................... libmsc/rrlp.c: add missing include Change-Id: Id33c9e5c04d61d08110ae80209f73ed14a5ef59c --- M src/libmsc/rrlp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/10337/1 diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 9cc6b04..71e0f95 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -19,7 +19,7 @@ * */ - +#include #include #include -- To view, visit https://gerrit.osmocom.org/10337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id33c9e5c04d61d08110ae80209f73ed14a5ef59c Gerrit-Change-Number: 10337 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 18:55:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 18:55:23 +0000 Subject: Change in osmo-msc[master]: RRLP: properly name the init function Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10338 Change subject: RRLP: properly name the init function ...................................................................... RRLP: properly name the init function We don't actually deal with DSO loading here... Change-Id: I24d0c9ad52f07f08176ad129878b48a591a3af6c --- M include/osmocom/msc/rrlp.h M src/libmsc/rrlp.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/10338/1 diff --git a/include/osmocom/msc/rrlp.h b/include/osmocom/msc/rrlp.h index 5071a7f..319af70 100644 --- a/include/osmocom/msc/rrlp.h +++ b/include/osmocom/msc/rrlp.h @@ -1,3 +1,3 @@ #pragma once -void on_dso_load_rrlp(void); +void msc_rrlp_init(void); diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 71e0f95..42f5036 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -96,7 +96,7 @@ return 0; } -void on_dso_load_rrlp(void) +void msc_rrlp_init(void) { osmo_signal_register_handler(SS_SUBSCR, subscr_sig_cb, NULL); osmo_signal_register_handler(SS_PAGING, paging_sig_cb, NULL); -- To view, visit https://gerrit.osmocom.org/10338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I24d0c9ad52f07f08176ad129878b48a591a3af6c Gerrit-Change-Number: 10338 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 18:55:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 18:55:23 +0000 Subject: Change in osmo-msc[master]: RRLP: fix: actually init the RRLP signal handlers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10339 Change subject: RRLP: fix: actually init the RRLP signal handlers ...................................................................... RRLP: fix: actually init the RRLP signal handlers Change-Id: I3618b4af48839d6d4b747be4eef2f57fa8f870c9 Closes: OS#3129 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/10339/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index b83691f..aa06fb9 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -681,6 +681,9 @@ /* Set up A interface */ a_init(msc_network->a.sccp, msc_network); + /* Init RRLP handlers */ + msc_rrlp_init(); + if (msc_cmdline_config.daemonize) { rc = osmo_daemonize(); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/10339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3618b4af48839d6d4b747be4eef2f57fa8f870c9 Gerrit-Change-Number: 10339 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 18:55:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 18:55:23 +0000 Subject: Change in osmo-msc[master]: RRLP: migrate and share mode definitions from msc_vty.c Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10340 Change subject: RRLP: migrate and share mode definitions from msc_vty.c ...................................................................... RRLP: migrate and share mode definitions from msc_vty.c Change-Id: I9560e6eab0ad1b5d57ca732741fc0b6f61f1a4a2 --- M include/osmocom/msc/rrlp.h M src/libmsc/msc_vty.c M src/libmsc/rrlp.c 3 files changed, 28 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/40/10340/1 diff --git a/include/osmocom/msc/rrlp.h b/include/osmocom/msc/rrlp.h index 319af70..7d1369d 100644 --- a/include/osmocom/msc/rrlp.h +++ b/include/osmocom/msc/rrlp.h @@ -1,3 +1,8 @@ #pragma once +#include + +enum rrlp_mode msc_rrlp_mode_parse(const char *arg); +const char *msc_rrlp_mode_name(enum rrlp_mode mode); + void msc_rrlp_init(void); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 3cbb001..fe6ae88 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -53,6 +53,7 @@ #include #include #include +#include static struct gsm_network *gsmnet = NULL; @@ -161,24 +162,6 @@ return CMD_SUCCESS; } -static const struct value_string rrlp_mode_names[] = { - { RRLP_MODE_NONE, "none" }, - { RRLP_MODE_MS_BASED, "ms-based" }, - { RRLP_MODE_MS_PREF, "ms-preferred" }, - { RRLP_MODE_ASS_PREF, "ass-preferred" }, - { 0, NULL } -}; - -static enum rrlp_mode rrlp_mode_parse(const char *arg) -{ - return get_string_value(rrlp_mode_names, arg); -} - -static const char *rrlp_mode_name(enum rrlp_mode mode) -{ - return get_value_string(rrlp_mode_names, mode); -} - DEFUN(cfg_net_rrlp_mode, cfg_net_rrlp_mode_cmd, "rrlp mode (none|ms-based|ms-preferred|ass-preferred)", "Radio Resource Location Protocol\n" @@ -188,7 +171,7 @@ "Request any location, prefer MS-based\n" "Request any location, prefer MS-assisted\n") { - gsmnet->rrlp.mode = rrlp_mode_parse(argv[0]); + gsmnet->rrlp.mode = msc_rrlp_mode_parse(argv[0]); return CMD_SUCCESS; } @@ -311,7 +294,7 @@ vty_out(vty, "%s", VTY_NEWLINE); vty_out(vty, " authentication %s%s", gsmnet->authentication_required ? "required" : "optional", VTY_NEWLINE); - vty_out(vty, " rrlp mode %s%s", rrlp_mode_name(gsmnet->rrlp.mode), + vty_out(vty, " rrlp mode %s%s", msc_rrlp_mode_name(gsmnet->rrlp.mode), VTY_NEWLINE); vty_out(vty, " mm info %u%s", gsmnet->send_mm_info, VTY_NEWLINE); if (gsmnet->tz.override != 0) { diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 42f5036..40a0a10 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -37,6 +39,24 @@ Accuracy=60, Method=gpsOrEOTD, ResponseTime=5, multipleSets */ static const uint8_t ass_pref_pos_req[] = { 0x40, 0x03, 0x79, 0x50 }; +static const struct value_string rrlp_mode_names[] = { + { RRLP_MODE_NONE, "none" }, + { RRLP_MODE_MS_BASED, "ms-based" }, + { RRLP_MODE_MS_PREF, "ms-preferred" }, + { RRLP_MODE_ASS_PREF, "ass-preferred" }, + { 0, NULL } +}; + +enum rrlp_mode msc_rrlp_mode_parse(const char *arg) +{ + return get_string_value(rrlp_mode_names, arg); +} + +const char *msc_rrlp_mode_name(enum rrlp_mode mode) +{ + return get_value_string(rrlp_mode_names, mode); +} + static int send_rrlp_req(struct gsm_subscriber_connection *conn) { struct gsm_network *net = conn->network; -- To view, visit https://gerrit.osmocom.org/10340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9560e6eab0ad1b5d57ca732741fc0b6f61f1a4a2 Gerrit-Change-Number: 10340 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 3 18:55:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 3 Aug 2018 18:55:23 +0000 Subject: Change in osmo-msc[master]: RRLP: print log when sending a position request Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10341 Change subject: RRLP: print log when sending a position request ...................................................................... RRLP: print log when sending a position request Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 --- M src/libmsc/rrlp.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/10341/1 diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 40a0a10..b1e336d 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -25,6 +25,7 @@ #include #include +#include #include /* RRLP msPositionReq, nsBased, @@ -77,6 +78,9 @@ return 0; } + LOGP(DRR, LOGL_NOTICE, "Sending '%s' RRLP position request\n", + msc_rrlp_mode_name(net->rrlp.mode)); + return gsm48_send_rr_app_info(conn, 0x00, sizeof(ms_based_pos_req), req); } -- To view, visit https://gerrit.osmocom.org/10341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 Gerrit-Change-Number: 10341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 3 23:59:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 3 Aug 2018 23:59:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2455?= Message-ID: <1320709018.76.1533340765255.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 740.30 KB...] checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOSCCP... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating openbsc.pc config.status: creating include/openbsc/Makefile config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/libtrau/Makefile config.status: creating src/libbsc/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libmgcp/Makefile config.status: creating src/libcommon/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.36-226f > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/openbsc/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC common_vty.o CC bsc_version.o CC debug.o CC gsm_data_shared.o CC gsup_client.o CC gsm_data.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_sdp.o CC mgcp_vty.o CC mgcp_osmux.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_om2000.o CC abis_nm.o CC abis_nm_vty.o CC abis_om2000_vty.o CC abis_rsl.o CC bsc_subscriber.o CC acc_ramp.o CC bsc_rll.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:444:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o Makefile:500: recipe for target 'bts_unknown.o' failed make[3]: *** [bts_unknown.o] Segmentation fault (core dumped) make[3]: *** Deleting file 'bts_unknown.o' make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libbsc' Makefile:435: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:507: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:415: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Aug 4 00:14:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 4 Aug 2018 00:14:50 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#2456?= In-Reply-To: <1320709018.76.1533340765255.JavaMail.jenkins@jenkins.osmocom.org> References: <1320709018.76.1533340765255.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <340238198.77.1533341690495.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Aug 4 09:19:27 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 4 Aug 2018 09:19:27 +0000 Subject: Change in simtrace2[master]: add synchronous UART transmission and use it in exceptions In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10313 to look at the new patch set (#2). Change subject: add synchronous UART transmission and use it in exceptions ...................................................................... add synchronous UART transmission and use it in exceptions The default ISR (particularly the HardFault handler) print information, but this information was not displayed on the console because the UART IRQ is lower than some default blocking IRQ. Allowing to set synchronous transfer corrects this. The underlying Atmel exception library had to be modified to use the synchronous output. Making UART_PutChar always synchronous when called from an ISR is not desired because we use TRACE_ macros is some ISR. The synchronous output must be set explicitly. Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c M firmware/libboard/common/include/uart_console.h M firmware/libboard/common/source/uart_console.c M firmware/libcommon/include/stdio.h M firmware/libcommon/source/fputs.c M firmware/libcommon/source/stdio.c 6 files changed, 108 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/13/10313/2 -- To view, visit https://gerrit.osmocom.org/10313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad Gerrit-Change-Number: 10313 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 4 09:19:27 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 4 Aug 2018 09:19:27 +0000 Subject: Change in simtrace2[master]: cardem: add state name in trace In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10316 to look at the new patch set (#2). Change subject: cardem: add state name in trace ...................................................................... cardem: add state name in trace this helps reading the output while debugging quite a lot Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 --- M firmware/libcommon/source/card_emu.c 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/16/10316/2 -- To view, visit https://gerrit.osmocom.org/10316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 Gerrit-Change-Number: 10316 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 4 09:19:27 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 4 Aug 2018 09:19:27 +0000 Subject: Change in simtrace2[master]: cardem (minor): trace tx data send over USB In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10318 to look at the new patch set (#2). Change subject: cardem (minor): trace tx data send over USB ...................................................................... cardem (minor): trace tx data send over USB Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 --- M firmware/libcommon/source/card_emu.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/18/10318/2 -- To view, visit https://gerrit.osmocom.org/10318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 Gerrit-Change-Number: 10318 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 4 09:24:03 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 4 Aug 2018 09:24:03 +0000 Subject: Change in simtrace2[master]: cardem (minor): trace tx data send over USB In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/10318 ) Change subject: cardem (minor): trace tx data send over USB ...................................................................... Patch Set 2: > why are you proposing this change? debug UART band-width is much > lower than the SIM card interface, and we are hex-dumping, so it > will never be able to keep up? right, this was mainly to debug and I had to increase the baud rate. I reduced to only show the number of bytes set. This is still useful to debug the activity, following the print for the incoming header in send_tpdu_header -- To view, visit https://gerrit.osmocom.org/10318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 Gerrit-Change-Number: 10318 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 04 Aug 2018 09:24:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 4 09:24:48 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 4 Aug 2018 09:24:48 +0000 Subject: Change in simtrace2[master]: cardem: add state name in trace In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/10316 ) Change subject: cardem: add state name in trace ...................................................................... Patch Set 2: > (1 comment) fixed. thanks for the tip. -- To view, visit https://gerrit.osmocom.org/10316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 Gerrit-Change-Number: 10316 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 04 Aug 2018 09:24:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 4 09:32:05 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 4 Aug 2018 09:32:05 +0000 Subject: Change in simtrace2[master]: add synchronous UART transmission and use it in exceptions In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/10313 ) Change subject: add synchronous UART transmission and use it in exceptions ...................................................................... Patch Set 2: > (1 comment) > > I think in general I would have preferred to simply use a separate > Uart transmit function from the hardirq handlers. Either by > explicitly changing those calls away from printf, or by > catching/redirecting printf using a #define that's #included only > in the exceptions.c file in order to bypass normal printf(). I've added an additional prinft for synchronous transfer. A define in the default exceptions redirects to this new printf. > Another idea that just comes to my mind: Couldn't we simply check > some CPU status flags to know that we're in an exception or in an > interrupt? This way the decision to bypass the ring buffer could > be entirely automatic without any explcit calls to disable the > buffer, or any of the hacks I described above? I would suggest to > look into this. If it turns out it's not that simple, please > report back and we can merge your current patch as-is. I also thought of this, but we don't want a synchronous transfer in every ISR (e.g. when TRACE_LOG is used in ISR for ERROR level). We only want synchronous transfer in final handler (with blocking while). I also think blocking until the transfer is complete is important. This would "remove" the UART 1-byte buffer, but at this point it just adds a 1-byte transfer delay for the whole printf. The benefit is that we are sure the complete string is printed (e.g. it a handler would reset after a print, the last by would not have time to be transferred) -- To view, visit https://gerrit.osmocom.org/10313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad Gerrit-Change-Number: 10313 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Sat, 04 Aug 2018 09:32:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 4 15:24:33 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Sat, 4 Aug 2018 15:24:33 +0000 Subject: Change in libosmocore[master]: comp128v23 (minor): update original code site and author Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10342 Change subject: comp128v23 (minor): update original code site and author ...................................................................... comp128v23 (minor): update original code site and author I was contacted by the (previously unknown) author who provided the new location of the original code. Change-Id: I2dabab20ad018ce473817986bdb250131c010bf1 --- M src/gsm/comp128v23.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/10342/1 diff --git a/src/gsm/comp128v23.c b/src/gsm/comp128v23.c index 68f4b2a..550f6a4 100644 --- a/src/gsm/comp128v23.c +++ b/src/gsm/comp128v23.c @@ -1,8 +1,10 @@ /*! \file comp128v23.c * COMP128 version 2 and 3 implementation, common algorithm used for GSM Authentication (A3/A8). * - * This code is a C conversion of the original code from - * http://www.hackingprojects.net/ + * This code is a C conversion of the original code by Tamas Jos from: + * - original (out of service): http://www.hackingprojects.net/ + * - original (archive): https://web.archive.org/web/20130730113347/http://www.hackingprojects.net/ + * - new site: https://github.com/skelsec/COMP128 */ /* * (C) 2013 by K?vin Redon -- To view, visit https://gerrit.osmocom.org/10342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2dabab20ad018ce473817986bdb250131c010bf1 Gerrit-Change-Number: 10342 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:54:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:54:30 +0000 Subject: Change in libosmocore[master]: comp128v23 (minor): update original code site and author In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10342 ) Change subject: comp128v23 (minor): update original code site and author ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2dabab20ad018ce473817986bdb250131c010bf1 Gerrit-Change-Number: 10342 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 06:54:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:54:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:54:31 +0000 Subject: Change in libosmocore[master]: comp128v23 (minor): update original code site and author In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10342 ) Change subject: comp128v23 (minor): update original code site and author ...................................................................... comp128v23 (minor): update original code site and author I was contacted by the (previously unknown) author who provided the new location of the original code. Change-Id: I2dabab20ad018ce473817986bdb250131c010bf1 --- M src/gsm/comp128v23.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gsm/comp128v23.c b/src/gsm/comp128v23.c index 68f4b2a..550f6a4 100644 --- a/src/gsm/comp128v23.c +++ b/src/gsm/comp128v23.c @@ -1,8 +1,10 @@ /*! \file comp128v23.c * COMP128 version 2 and 3 implementation, common algorithm used for GSM Authentication (A3/A8). * - * This code is a C conversion of the original code from - * http://www.hackingprojects.net/ + * This code is a C conversion of the original code by Tamas Jos from: + * - original (out of service): http://www.hackingprojects.net/ + * - original (archive): https://web.archive.org/web/20130730113347/http://www.hackingprojects.net/ + * - new site: https://github.com/skelsec/COMP128 */ /* * (C) 2013 by K?vin Redon -- To view, visit https://gerrit.osmocom.org/10342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2dabab20ad018ce473817986bdb250131c010bf1 Gerrit-Change-Number: 10342 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:55:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:55:24 +0000 Subject: Change in simtrace2[master]: add synchronous UART transmission and use it in exceptions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10313 ) Change subject: add synchronous UART transmission and use it in exceptions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad Gerrit-Change-Number: 10313 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Sun, 05 Aug 2018 06:55:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:55:51 +0000 Subject: Change in simtrace2[master]: cardem: add state name in trace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10316 ) Change subject: cardem: add state name in trace ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 Gerrit-Change-Number: 10316 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Sun, 05 Aug 2018 06:55:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:07 +0000 Subject: Change in simtrace2[master]: cardem (minor): trace tx data send over USB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10318 ) Change subject: cardem (minor): trace tx data send over USB ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 Gerrit-Change-Number: 10318 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Sun, 05 Aug 2018 06:56:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:11 +0000 Subject: Change in simtrace2[master]: add synchronous UART transmission and use it in exceptions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10313 ) Change subject: add synchronous UART transmission and use it in exceptions ...................................................................... add synchronous UART transmission and use it in exceptions The default ISR (particularly the HardFault handler) print information, but this information was not displayed on the console because the UART IRQ is lower than some default blocking IRQ. Allowing to set synchronous transfer corrects this. The underlying Atmel exception library had to be modified to use the synchronous output. Making UART_PutChar always synchronous when called from an ISR is not desired because we use TRACE_ macros is some ISR. The synchronous output must be set explicitly. Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c M firmware/libboard/common/include/uart_console.h M firmware/libboard/common/source/uart_console.c M firmware/libcommon/include/stdio.h M firmware/libcommon/source/fputs.c M firmware/libcommon/source/stdio.c 6 files changed, 108 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c index 74e0fbd..6d2a135 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c @@ -2,6 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2009, Atmel Corporation + * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -41,6 +42,7 @@ * Headers *----------------------------------------------------------------------------*/ +#define printf printf_sync #include "chip.h" /*---------------------------------------------------------------------------- diff --git a/firmware/libboard/common/include/uart_console.h b/firmware/libboard/common/include/uart_console.h index c0ee3a7..70425bc 100644 --- a/firmware/libboard/common/include/uart_console.h +++ b/firmware/libboard/common/include/uart_console.h @@ -29,16 +29,15 @@ */ #ifndef _UART_CONSOLE_ #define _UART_CONSOLE_ - #include extern void UART_Configure( uint32_t dwBaudrate, uint32_t dwMasterClock ) ; -extern void UART_Exit(void) ; +extern void UART_Exit( void ) ; extern void UART_PutChar( uint8_t uc ) ; +extern void UART_PutChar_Sync( uint8_t uc ) ; extern uint32_t UART_GetChar( void ) ; extern uint32_t UART_IsRxReady( void ) ; - extern void UART_DumpFrame( uint8_t* pucFrame, uint32_t dwSize ) ; extern void UART_DumpMemory( uint8_t* pucBuffer, uint32_t dwSize, uint32_t dwAddress ) ; extern uint32_t UART_GetInteger( uint32_t* pdwValue ) ; diff --git a/firmware/libboard/common/source/uart_console.c b/firmware/libboard/common/source/uart_console.c index 3ce7331..3a00e49 100644 --- a/firmware/libboard/common/source/uart_console.c +++ b/firmware/libboard/common/source/uart_console.c @@ -2,6 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2009, Atmel Corporation + * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -135,10 +136,10 @@ /** * \brief Outputs a character on the UART line. * - * \note This function is synchronous (i.e. uses polling). + * \note This function is asynchronous (i.e. uses a buffer and interrupt to complete the transfer). * \param c Character to send. */ -extern void UART_PutChar( uint8_t c ) +void UART_PutChar( uint8_t uc ) { Uart *pUart = CONSOLE_UART ; @@ -148,9 +149,8 @@ UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK); } - /* Only store input if buffer is not full, else drop it */ if (!rbuf_is_full(&uart_tx_buffer)) { - rbuf_write(&uart_tx_buffer, c); + rbuf_write(&uart_tx_buffer, uc); if (!(pUart->UART_IMR & UART_IMR_TXRDY)) { pUart->UART_IER = UART_IER_TXRDY; CONSOLE_ISR(); @@ -159,6 +159,28 @@ } /** + * \brief Outputs a character on the UART line. + * + * \note This function is synchronous (i.e. uses polling and blocks until the transfer is complete). + * \param c Character to send. + */ +void UART_PutChar_Sync( uint8_t uc ) +{ + Uart *pUart = CONSOLE_UART ; + + /* Initialize console is not already done */ + if ( !_ucIsConsoleInitialized ) + { + UART_Configure(CONSOLE_BAUDRATE, BOARD_MCK); + } + + while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to be empty */ + pUart->UART_THR = uc; /* Send data to UART peripheral */ + while (!(pUart->UART_SR & UART_SR_TXRDY)); /* Wait for transfer buffer to transferred to shift register */ + while (!(pUart->UART_SR & UART_SR_TXEMPTY)); /* Wait for transfer shift register to be empty (i.e. transfer is complete) */ +} + +/** * \brief Input a character from the UART line. * * \note This function is synchronous diff --git a/firmware/libcommon/include/stdio.h b/firmware/libcommon/include/stdio.h index 7695d20..258c7ab 100644 --- a/firmware/libcommon/include/stdio.h +++ b/firmware/libcommon/include/stdio.h @@ -52,9 +52,14 @@ signed int sprintf(char *pStr, const char *pFormat, ...); signed int puts(const char *pStr); - int fputc(int c, FILE *stream); int fputs(const char *s, FILE *stream); #define putc(c, stream) fputc(c, stream) #define putchar(c) fputc(c, stdout) + +signed int vfprintf_sync(FILE *pStream, const char *pFormat, va_list ap); +signed int vprintf_sync(const char *pFormat, va_list ap); +signed int printf_sync(const char *pFormat, ...); +int fputc_sync(int c, FILE *stream); +int fputs_sync(const char *s, FILE *stream); diff --git a/firmware/libcommon/source/fputs.c b/firmware/libcommon/source/fputs.c index ca6f851..110f68e 100644 --- a/firmware/libcommon/source/fputs.c +++ b/firmware/libcommon/source/fputs.c @@ -26,6 +26,19 @@ int fputs(const char *s, FILE *stream) { while (*s != '\0') - UART_PutChar(*s++); + fputc(*s++, stream); + return 0; +} + +int fputc_sync(int c, FILE *stream) +{ + UART_PutChar_Sync(c); + return c; +} + +int fputs_sync(const char *s, FILE *stream) +{ + while (*s != '\0') + fputc_sync(*s++, stream); return 0; } diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index 505c895..06ad611 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -2,6 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2008, Atmel Corporation + * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -436,6 +437,32 @@ } //------------------------------------------------------------------------------ +/// Outputs a formatted string on the given stream. Format arguments are given +/// in a va_list instance. +/// \note This function is synchronous (i.e. blocks until the print completes) +/// \param pStream Output stream. +/// \param pFormat Format string +/// \param ap Argument list. +//------------------------------------------------------------------------------ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wsuggest-attribute=format" +signed int vfprintf_sync(FILE *pStream, const char *pFormat, va_list ap) +{ + char pStr[MAX_STRING_SIZE]; + char pError[] = "stdio.c: increase MAX_STRING_SIZE\n\r"; + + // Write formatted string in buffer + if (vsprintf(pStr, pFormat, ap) >= MAX_STRING_SIZE) { + + fputs_sync(pError, stderr); + } + + // Display string + return fputs_sync(pStr, pStream); +} +#pragma GCC diagnostic pop + +//------------------------------------------------------------------------------ /// Outputs a formatted string on the DBGU stream. Format arguments are given /// in a va_list instance. /// \param pFormat Format string @@ -447,6 +474,18 @@ } //------------------------------------------------------------------------------ +/// Outputs a formatted string on the DBGU stream. Format arguments are given +/// in a va_list instance. +/// \note This function is synchronous (i.e. blocks until the print completes) +/// \param pFormat Format string +/// \param ap Argument list. +//------------------------------------------------------------------------------ +signed int vprintf_sync(const char *pFormat, va_list ap) +{ + return vfprintf_sync(stdout, pFormat, ap); +} + +//------------------------------------------------------------------------------ /// Outputs a formatted string on the given stream, using a variable number of /// arguments. /// \param pStream Output stream. @@ -484,6 +523,25 @@ } //------------------------------------------------------------------------------ +/// Outputs a formatted string on the DBGU stream, using a variable number of +/// arguments. +/// \note This function is synchronous (i.e. blocks until the print completes) +/// \param pFormat Format string. +//------------------------------------------------------------------------------ +signed int printf_sync(const char *pFormat, ...) +{ + va_list ap; + signed int result; + + // Forward call to vprintf + va_start(ap, pFormat); + result = vprintf_sync(pFormat, ap); + va_end(ap); + + return result; +} + +//------------------------------------------------------------------------------ /// Writes a formatted string inside another string. /// \param pStr Storage string. /// \param pFormat Format string. -- To view, visit https://gerrit.osmocom.org/10313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1b4ace5185cf2dc32684934ed12bf6a8682e9bad Gerrit-Change-Number: 10313 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:11 +0000 Subject: Change in simtrace2[master]: cardem: minor typo fix in comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10314 ) Change subject: cardem: minor typo fix in comment ...................................................................... cardem: minor typo fix in comment Change-Id: Ib1dee95e15db1c6bb3b45920d7c1a567e2ba474b --- M firmware/libcommon/source/card_emu.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index ad6b4d9..fb68660 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -85,7 +85,7 @@ TPDU_S_WAIT_P2, /* waiting for P2 byte from reader */ TPDU_S_WAIT_P3, /* waiting for P3 byte from reader */ TPDU_S_WAIT_PB, /* waiting for Tx of procedure byte */ - TPDU_S_WAIT_RX, /* waiitng for more data from reader */ + TPDU_S_WAIT_RX, /* waiting for more data from reader */ TPDU_S_WAIT_TX, /* waiting for more data to reader */ }; @@ -792,7 +792,7 @@ card_emu_uart_tx(ch->uart_chan, byte); - /* this must happen _after_ the byte has been transmittd */ + /* this must happen _after_ the byte has been transmitted */ switch (ch->tpdu.state) { case TPDU_S_WAIT_PB: /* if we just transmitted the procedure byte, we need to decide -- To view, visit https://gerrit.osmocom.org/10314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1dee95e15db1c6bb3b45920d7c1a567e2ba474b Gerrit-Change-Number: 10314 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:12 +0000 Subject: Change in simtrace2[master]: cardem (minor): remove to verbose log trace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10315 ) Change subject: cardem (minor): remove to verbose log trace ...................................................................... cardem (minor): remove to verbose log trace Change-Id: Ie43a33af3728c0700f71527ca75d909a9ebd2529 --- M firmware/libcommon/source/card_emu.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index fb68660..14a5dd8 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -360,7 +360,6 @@ if (ch->atr.idx < ch->atr.len) { uint8_t byte = ch->atr.atr[ch->atr.idx++]; card_emu_uart_tx(ch->uart_chan, byte); - TRACE_DEBUG("%u: ATR TX: %02x\n\r", ch->num, byte); return 1; } else { /* The ATR has been completely transmitted */ /* search for TC2 to updated WI */ -- To view, visit https://gerrit.osmocom.org/10315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie43a33af3728c0700f71527ca75d909a9ebd2529 Gerrit-Change-Number: 10315 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:12 +0000 Subject: Change in simtrace2[master]: cardem: add state name in trace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10316 ) Change subject: cardem: add state name in trace ...................................................................... cardem: add state name in trace this helps reading the output while debugging quite a lot Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 --- M firmware/libcommon/source/card_emu.c 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index 14a5dd8..fa09829 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -54,6 +54,22 @@ ISO_S_IN_TPDU, /* inside a TPDU */ }; +const struct value_string iso7816_3_card_state_names[] = { + OSMO_VALUE_STRING(ISO_S_WAIT_POWER), + OSMO_VALUE_STRING(ISO_S_WAIT_CLK), + OSMO_VALUE_STRING(ISO_S_WAIT_RST), + OSMO_VALUE_STRING(ISO_S_WAIT_ATR), + OSMO_VALUE_STRING(ISO_S_IN_ATR), + OSMO_VALUE_STRING(ISO_S_IN_PTS), + OSMO_VALUE_STRING(ISO_S_WAIT_TPDU), + OSMO_VALUE_STRING(ISO_S_IN_TPDU), + { + .value = 0, + .str = NULL, + }, +}; + + /* detailed sub-states of ISO_S_IN_PTS */ enum pts_state { PTS_S_WAIT_REQ_PTSS, @@ -285,8 +301,9 @@ if (ch->state == new_state) return; - TRACE_DEBUG("%u: 7816 card state %u -> %u\r\n", ch->num, - ch->state, new_state); + TRACE_DEBUG("%u: 7816 card state %u (%s) -> %u (%s)\r\n", ch->num, + ch->state, get_value_string(iso7816_3_card_state_names, ch->state), + new_state, get_value_string(iso7816_3_card_state_names, new_state)); ch->state = new_state; switch (new_state) { -- To view, visit https://gerrit.osmocom.org/10316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idf301e09cf14e2412e29dcb252563bc6e4e5c630 Gerrit-Change-Number: 10316 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:13 +0000 Subject: Change in simtrace2[master]: add libosmcore utilities In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10317 ) Change subject: add libosmcore utilities ...................................................................... add libosmcore utilities osmo_hexdump is particularly useful. previously it was only defined, but not implemented. this cause random behaviour upon call, often resulting in memory corruption. Change-Id: Ifd9120fa951f41693903fb657d10826959f1599f --- A firmware/libosmocore/source/utils.c 1 file changed, 632 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libosmocore/source/utils.c b/firmware/libosmocore/source/utils.c new file mode 100644 index 0000000..3096572 --- /dev/null +++ b/firmware/libosmocore/source/utils.c @@ -0,0 +1,632 @@ +/* + * (C) 2011 by Harald Welte + * (C) 2011 by Sylvain Munaut + * (C) 2014 by Nils O. Sel?sdal + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + + +#include +#include +#include +#include +#include +#include + +#include +#include + + +/*! \addtogroup utils + * @{ + * various utility routines + * + * \file utils.c */ + +static char namebuf[255]; + +/*! get human-readable string for given value + * \param[in] vs Array of value_string tuples + * \param[in] val Value to be converted + * \returns pointer to human-readable string + * + * If val is found in vs, the array's string entry is returned. Otherwise, an + * "unknown" string containing the actual value is composed in a static buffer + * that is reused across invocations. + */ +const char *get_value_string(const struct value_string *vs, uint32_t val) +{ + const char *str = get_value_string_or_null(vs, val); + if (str) + return str; + + snprintf(namebuf, sizeof(namebuf), "unknown 0x%"PRIx32, val); + namebuf[sizeof(namebuf) - 1] = '\0'; + return namebuf; +} + +/*! get human-readable string or NULL for given value + * \param[in] vs Array of value_string tuples + * \param[in] val Value to be converted + * \returns pointer to human-readable string or NULL if val is not found + */ +const char *get_value_string_or_null(const struct value_string *vs, + uint32_t val) +{ + int i; + + for (i = 0;; i++) { + if (vs[i].value == 0 && vs[i].str == NULL) + break; + if (vs[i].value == val) + return vs[i].str; + } + + return NULL; +} + +/*! get numeric value for given human-readable string + * \param[in] vs Array of value_string tuples + * \param[in] str human-readable string + * \returns numeric value (>0) or negative numer in case of error + */ +int get_string_value(const struct value_string *vs, const char *str) +{ + int i; + + for (i = 0;; i++) { + if (vs[i].value == 0 && vs[i].str == NULL) + break; + if (!strcasecmp(vs[i].str, str)) + return vs[i].value; + } + return -EINVAL; +} + +/*! Convert BCD-encoded digit into printable character + * \param[in] bcd A single BCD-encoded digit + * \returns single printable character + */ +char osmo_bcd2char(uint8_t bcd) +{ + if (bcd < 0xa) + return '0' + bcd; + else + return 'A' + (bcd - 0xa); +} + +/*! Convert number in ASCII to BCD value + * \param[in] c ASCII character + * \returns BCD encoded value of character + */ +uint8_t osmo_char2bcd(char c) +{ + if (c >= '0' && c <= '9') + return c - 0x30; + else if (c >= 'A' && c <= 'F') + return 0xa + (c - 'A'); + else if (c >= 'a' && c <= 'f') + return 0xa + (c - 'a'); + else + return 0; +} + +/*! Parse a string containing hexadecimal digits + * \param[in] str string containing ASCII encoded hexadecimal digits + * \param[out] b output buffer + * \param[in] max_len maximum space in output buffer + * \returns number of parsed octets, or -1 on error + */ +int osmo_hexparse(const char *str, uint8_t *b, int max_len) + +{ + char c; + uint8_t v; + const char *strpos; + unsigned int nibblepos = 0; + + memset(b, 0x00, max_len); + + for (strpos = str; (c = *strpos); strpos++) { + /* skip whitespace */ + if (c == ' ' || c == '\t' || c == '\n' || c == '\r') + continue; + + /* If the buffer is too small, error out */ + if (nibblepos >= (max_len << 1)) + return -1; + + if (c >= '0' && c <= '9') + v = c - '0'; + else if (c >= 'a' && c <= 'f') + v = 10 + (c - 'a'); + else if (c >= 'A' && c <= 'F') + v = 10 + (c - 'A'); + else + return -1; + + b[nibblepos >> 1] |= v << (nibblepos & 1 ? 0 : 4); + nibblepos ++; + } + + /* In case of uneven amount of digits, the last byte is not complete + * and that's an error. */ + if (nibblepos & 1) + return -1; + + return nibblepos >> 1; +} + +static char hexd_buff[4096]; +static const char hex_chars[] = "0123456789abcdef"; + +static char *_osmo_hexdump(const unsigned char *buf, int len, const char *delim) +{ + int i; + char *cur = hexd_buff; + + hexd_buff[0] = 0; + for (i = 0; i < len; i++) { + const char *delimp = delim; + int len_remain = sizeof(hexd_buff) - (cur - hexd_buff); + if (len_remain < 3) + break; + + *cur++ = hex_chars[buf[i] >> 4]; + *cur++ = hex_chars[buf[i] & 0xf]; + + while (len_remain > 1 && *delimp) { + *cur++ = *delimp++; + len_remain--; + } + + *cur = 0; + } + hexd_buff[sizeof(hexd_buff)-1] = 0; + return hexd_buff; +} + +/*! Convert a sequence of unpacked bits to ASCII string + * \param[in] bits A sequence of unpacked bits + * \param[in] len Length of bits + */ +char *osmo_ubit_dump(const uint8_t *bits, unsigned int len) +{ + int i; + + if (len > sizeof(hexd_buff)-1) + len = sizeof(hexd_buff)-1; + memset(hexd_buff, 0, sizeof(hexd_buff)); + + for (i = 0; i < len; i++) { + char outch; + switch (bits[i]) { + case 0: + outch = '0'; + break; + case 0xff: + outch = '?'; + break; + case 1: + outch = '1'; + break; + default: + outch = 'E'; + break; + } + hexd_buff[i] = outch; + } + hexd_buff[sizeof(hexd_buff)-1] = 0; + return hexd_buff; +} + +/*! Convert binary sequence to hexadecimal ASCII string + * \param[in] buf pointer to sequence of bytes + * \param[in] len length of buf in number of bytes + * \returns pointer to zero-terminated string + * + * This function will print a sequence of bytes as hexadecimal numbers, + * adding one space character between each byte (e.g. "1a ef d9") + * + * The maximum size of the output buffer is 4096 bytes, i.e. the maximum + * number of input bytes that can be printed in one call is 1365! + */ +char *osmo_hexdump(const unsigned char *buf, int len) +{ + return _osmo_hexdump(buf, len, " "); +} + +/*! Convert binary sequence to hexadecimal ASCII string + * \param[in] buf pointer to sequence of bytes + * \param[in] len length of buf in number of bytes + * \returns pointer to zero-terminated string + * + * This function will print a sequence of bytes as hexadecimal numbers, + * without any space character between each byte (e.g. "1aefd9") + * + * The maximum size of the output buffer is 4096 bytes, i.e. the maximum + * number of input bytes that can be printed in one call is 2048! + */ +char *osmo_hexdump_nospc(const unsigned char *buf, int len) +{ + return _osmo_hexdump(buf, len, ""); +} + +/* Compat with previous typo to preserve abi */ +char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len) +#if defined(__MACH__) && defined(__APPLE__) + ; +#else + __attribute__((weak, alias("osmo_hexdump_nospc"))); +#endif + +#include +/*! Convert an entire string to lower case + * \param[out] out output string, caller-allocated + * \param[in] in input string + */ +void osmo_str2lower(char *out, const char *in) +{ + unsigned int i; + + for (i = 0; i < strlen(in); i++) + out[i] = tolower((const unsigned char)in[i]); + out[strlen(in)] = '\0'; +} + +/*! Convert an entire string to upper case + * \param[out] out output string, caller-allocated + * \param[in] in input string + */ +void osmo_str2upper(char *out, const char *in) +{ + unsigned int i; + + for (i = 0; i < strlen(in); i++) + out[i] = toupper((const unsigned char)in[i]); + out[strlen(in)] = '\0'; +} + +/*! Wishful thinking to generate a constant time compare + * \param[in] exp Expected data + * \param[in] rel Comparison value + * \param[in] count Number of bytes to compare + * \returns 1 in case \a exp equals \a rel; zero otherwise + * + * Compare count bytes of exp to rel. Return 0 if they are identical, 1 + * otherwise. Do not return a mismatch on the first mismatching byte, + * but always compare all bytes, regardless. The idea is that the amount of + * matching bytes cannot be inferred from the time the comparison took. */ +int osmo_constant_time_cmp(const uint8_t *exp, const uint8_t *rel, const int count) +{ + int x = 0, i; + + for (i = 0; i < count; ++i) + x |= exp[i] ^ rel[i]; + + /* if x is zero, all data was identical */ + return x? 1 : 0; +} + +/*! Generic retrieval of 1..8 bytes as big-endian uint64_t + * \param[in] data Input data as byte-array + * \param[in] data_len Length of \a data in octets + * \returns uint64_t of \a data interpreted as big-endian + * + * This is like osmo_load64be_ext, except that if data_len is less than + * sizeof(uint64_t), the data is interpreted as the least significant bytes + * (osmo_load64be_ext loads them as the most significant bytes into the + * returned uint64_t). In this way, any integer size up to 64 bits can be + * decoded conveniently by using sizeof(), without the need to call specific + * numbered functions (osmo_load16, 32, ...). */ +uint64_t osmo_decode_big_endian(const uint8_t *data, size_t data_len) +{ + uint64_t value = 0; + + while (data_len > 0) { + value = (value << 8) + *data; + data += 1; + data_len -= 1; + } + + return value; +} + +/*! Generic big-endian encoding of big endian number up to 64bit + * \param[in] value unsigned integer value to be stored + * \param[in] data_len number of octets + * \returns static buffer containing big-endian stored value + * + * This is like osmo_store64be_ext, except that this returns a static buffer of + * the result (for convenience, but not threadsafe). If data_len is less than + * sizeof(uint64_t), only the least significant bytes of value are encoded. */ +uint8_t *osmo_encode_big_endian(uint64_t value, size_t data_len) +{ + static uint8_t buf[sizeof(uint64_t)]; + OSMO_ASSERT(data_len <= ARRAY_SIZE(buf)); + osmo_store64be_ext(value, buf, data_len); + return buf; +} + +/*! Copy a C-string into a sized buffer + * \param[in] src source string + * \param[out] dst destination string + * \param[in] siz size of the \a dst buffer + * \returns length of \a src + * + * Copy at most \a siz bytes from \a src to \a dst, ensuring that the result is + * NUL terminated. The NUL character is included in \a siz, i.e. passing the + * actual sizeof(*dst) is correct. + */ +size_t osmo_strlcpy(char *dst, const char *src, size_t siz) +{ + size_t ret = src ? strlen(src) : 0; + + if (siz) { + size_t len = (ret >= siz) ? siz - 1 : ret; + if (src) + memcpy(dst, src, len); + dst[len] = '\0'; + } + return ret; +} + +/*! Validate that a given string is a hex string within given size limits. + * Note that each hex digit amounts to a nibble, so if checking for a hex + * string to result in N bytes, pass amount of digits as 2*N. + * \param str A nul-terminated string to validate, or NULL. + * \param min_digits least permitted amount of digits. + * \param max_digits most permitted amount of digits. + * \param require_even if true, require an even amount of digits. + * \returns true when the hex_str contains only hexadecimal digits (no + * whitespace) and matches the requested length; also true + * when min_digits <= 0 and str is NULL. + */ +bool osmo_is_hexstr(const char *str, int min_digits, int max_digits, + bool require_even) +{ + int len; + /* Use unsigned char * to avoid a compiler warning of + * "error: array subscript has type 'char' [-Werror=char-subscripts]" */ + const unsigned char *pos = (const unsigned char*)str; + if (!pos) + return min_digits < 1; + for (len = 0; *pos && len < max_digits; len++, pos++) + if (!isxdigit(*pos)) + return false; + if (len < min_digits) + return false; + /* With not too many digits, we should have reached *str == nul */ + if (*pos) + return false; + if (require_even && (len & 1)) + return false; + + return true; +} + +/*! Determine if a given identifier is valid, i.e. doesn't contain illegal chars + * \param[in] str String to validate + * \param[in] sep_chars Permitted separation characters between identifiers. + * \returns true in case \a str contains only valid identifiers and sep_chars, false otherwise + */ +bool osmo_separated_identifiers_valid(const char *str, const char *sep_chars) +{ + /* characters that are illegal in names */ + static const char illegal_chars[] = "., {}[]()<>|~\\^`'\"?=;/+*&%$#!"; + unsigned int i; + size_t len; + + /* an empty string is not a valid identifier */ + if (!str || (len = strlen(str)) == 0) + return false; + + for (i = 0; i < len; i++) { + if (sep_chars && strchr(sep_chars, str[i])) + continue; + /* check for 7-bit ASCII */ + if (str[i] & 0x80) + return false; + if (!isprint((int)str[i])) + return false; + /* check for some explicit reserved control characters */ + if (strchr(illegal_chars, str[i])) + return false; + } + + return true; +} + +/*! Determine if a given identifier is valid, i.e. doesn't contain illegal chars + * \param[in] str String to validate + * \returns true in case \a str contains valid identifier, false otherwise + */ +bool osmo_identifier_valid(const char *str) +{ + return osmo_separated_identifiers_valid(str, NULL); +} + +/*! Return the string with all non-printable characters escaped. + * \param[in] str A string that may contain any characters. + * \param[in] len Pass -1 to print until nul char, or >= 0 to force a length. + * \param[inout] buf string buffer to write escaped characters to. + * \param[in] bufsize size of \a buf. + * \returns buf containing an escaped representation, possibly truncated, or str itself. + */ +const char *osmo_escape_str_buf(const char *str, int in_len, char *buf, size_t bufsize) +{ + int in_pos = 0; + int next_unprintable = 0; + int out_pos = 0; + char *out = buf; + /* -1 to leave space for a final \0 */ + int out_len = bufsize-1; + + if (!str) + return "(null)"; + + if (in_len < 0) + in_len = strlen(str); + + while (in_pos < in_len) { + for (next_unprintable = in_pos; + next_unprintable < in_len && isprint((int)str[next_unprintable]) + && str[next_unprintable] != '"' + && str[next_unprintable] != '\\'; + next_unprintable++); + + if (next_unprintable == in_len + && in_pos == 0) + return str; + + while (in_pos < next_unprintable && out_pos < out_len) + out[out_pos++] = str[in_pos++]; + + if (out_pos == out_len || in_pos == in_len) + goto done; + + switch (str[next_unprintable]) { +#define BACKSLASH_CASE(c, repr) \ + case c: \ + if (out_pos > out_len-2) \ + goto done; \ + out[out_pos++] = '\\'; \ + out[out_pos++] = repr; \ + break + + BACKSLASH_CASE('\n', 'n'); + BACKSLASH_CASE('\r', 'r'); + BACKSLASH_CASE('\t', 't'); + BACKSLASH_CASE('\0', '0'); + BACKSLASH_CASE('\a', 'a'); + BACKSLASH_CASE('\b', 'b'); + BACKSLASH_CASE('\v', 'v'); + BACKSLASH_CASE('\f', 'f'); + BACKSLASH_CASE('\\', '\\'); + BACKSLASH_CASE('"', '"'); +#undef BACKSLASH_CASE + + default: + out_pos += snprintf(&out[out_pos], out_len - out_pos, "\\%u", (unsigned char)str[in_pos]); + if (out_pos > out_len) { + out_pos = out_len; + goto done; + } + break; + } + in_pos ++; + } + +done: + out[out_pos] = '\0'; + return out; +} + +/*! Return the string with all non-printable characters escaped. + * Call osmo_escape_str_buf() with a static buffer. + * \param[in] str A string that may contain any characters. + * \param[in] len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns buf containing an escaped representation, possibly truncated, or str itself. + */ +const char *osmo_escape_str(const char *str, int in_len) +{ + return osmo_escape_str_buf(str, in_len, namebuf, sizeof(namebuf)); +} + +/*! Like osmo_escape_str(), but returns double-quotes around a string, or "NULL" for a NULL string. + * This allows passing any char* value and get its C representation as string. + * \param[in] str A string that may contain any characters. + * \param[in] len Pass -1 to print until nul char, or >= 0 to force a length. + * \returns buf containing an escaped representation, possibly truncated, or str itself. + */ +const char *osmo_quote_str_buf(const char *str, int in_len, char *buf, size_t bufsize) +{ + const char *res; + int l; + if (!str) + return "NULL"; + if (bufsize < 3) + return ""; + buf[0] = '"'; + res = osmo_escape_str_buf(str, in_len, buf + 1, bufsize - 2); + /* if osmo_escape_str_buf() returned the str itself, we need to copy it to buf to be able to + * quote it. */ + if (res == str) { + /* max_len = bufsize - two quotes - nul term */ + int max_len = bufsize - 2 - 1; + if (in_len >= 0) + max_len = OSMO_MIN(in_len, max_len); + /* It is not allowed to pass unterminated strings into osmo_strlcpy() :/ */ + strncpy(buf + 1, str, max_len); + buf[1 + max_len] = '\0'; + } + l = strlen(buf); + buf[l] = '"'; + buf[l+1] = '\0'; /* both osmo_escape_str_buf() and max_len above ensure room for '\0' */ + return buf; +} + +const char *osmo_quote_str(const char *str, int in_len) +{ + return osmo_quote_str_buf(str, in_len, namebuf, sizeof(namebuf)); +} + +/*! perform an integer square root operation on unsigned 32bit integer. + * This implementation is taken from "Hacker's Delight" Figure 11-1 "Integer square root, Newton's + * method", which can also be found at http://www.hackersdelight.org/hdcodetxt/isqrt.c.txt */ +uint32_t osmo_isqrt32(uint32_t x) +{ + uint32_t x1; + int s, g0, g1; + + if (x <= 1) + return x; + + s = 1; + x1 = x - 1; + if (x1 > 0xffff) { + s = s + 8; + x1 = x1 >> 16; + } + if (x1 > 0xff) { + s = s + 4; + x1 = x1 >> 8; + } + if (x1 > 0xf) { + s = s + 2; + x1 = x1 >> 4; + } + if (x1 > 0x3) { + s = s + 1; + } + + g0 = 1 << s; /* g0 = 2**s */ + g1 = (g0 + (x >> s)) >> 1; /* g1 = (g0 + x/g0)/2 */ + + /* converges after four to five divisions for arguments up to 16,785,407 */ + while (g1 < g0) { + g0 = g1; + g1 = (g0 + (x/g0)) >> 1; + } + return g0; +} + +/*! @} */ -- To view, visit https://gerrit.osmocom.org/10317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifd9120fa951f41693903fb657d10826959f1599f Gerrit-Change-Number: 10317 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:13 +0000 Subject: Change in simtrace2[master]: cardem (minor): trace tx data send over USB In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10318 ) Change subject: cardem (minor): trace tx data send over USB ...................................................................... cardem (minor): trace tx data send over USB Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 --- M firmware/libcommon/source/card_emu.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index fa09829..af90351 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -223,6 +223,9 @@ rd = (struct cardemu_usb_msg_rx_data *) msg->l2h; rd->data_len = msgb_l2len(msg) - sizeof(*rd); + TRACE_INFO("%u: %s (%u)\n\r", + ch->num, __func__, rd->data_len); + usb_buf_upd_len_and_submit(msg); } -- To view, visit https://gerrit.osmocom.org/10318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I69cef43dd5a78e9f82cc045cdb90c326b03d1f68 Gerrit-Change-Number: 10318 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:14 +0000 Subject: Change in simtrace2[master]: remsim: fix USB hanging USB transfer In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10319 ) Change subject: remsim: fix USB hanging USB transfer ...................................................................... remsim: fix USB hanging USB transfer After a couple of seconds of USB data exchange between remsim and cardem, the USB transfer hangs. On host side (remsim) I can see the USB BULK IN request. On device side (cardem) I see that data has been submitted and "sent" over USB, but on wireshark with USBmon I don't see the corresponding USB BULK IN response. When exiting remsim or just after powering of qmod (causing an error in remsim) the USB BULK IN is show in wireshark. Thus it must have been in a buffer, but not read by libusb_bulk_transfer. By shortening the timeout a new libusb_bulk_transfer is made more frequently, and the data gets read successfully. T;his change also fixes the URB data display. Change-Id: I1d124a41cc90893506933f6d76dc7331e52a74f9 --- M host/simtrace2-remsim.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/host/simtrace2-remsim.c b/host/simtrace2-remsim.c index 52c5051..9a681b4 100644 --- a/host/simtrace2-remsim.c +++ b/host/simtrace2-remsim.c @@ -536,7 +536,7 @@ /* read data from SIMtrace2 device (local or via USB) */ if (transp->udp_fd < 0) { rc = libusb_bulk_transfer(transp->usb_devh, transp->usb_ep.in, - buf, sizeof(buf), &xfer_len, 100000); + buf, sizeof(buf), &xfer_len, 100); if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT && rc != LIBUSB_ERROR_INTERRUPTED && rc != LIBUSB_ERROR_IO) { @@ -553,7 +553,7 @@ } /* dispatch any incoming data */ if (xfer_len > 0) { - printf("URB: %s\n", osmo_hexdump(buf, rc)); + printf("URB: %s\n", osmo_hexdump(buf, xfer_len)); process_usb_msg(ci, buf, xfer_len); msg_count++; byte_count += xfer_len; -- To view, visit https://gerrit.osmocom.org/10319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1d124a41cc90893506933f6d76dc7331e52a74f9 Gerrit-Change-Number: 10319 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:26 +0000 Subject: Change in osmo-msc[master]: msc/signal.h: use #pragma once include guard In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10335 ) Change subject: msc/signal.h: use #pragma once include guard ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I114026808abeff72a3f4f3cb1b84680c116409d4 Gerrit-Change-Number: 10335 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 06:56:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:33 +0000 Subject: Change in osmo-msc[master]: msc/rrlp.h: use #pragma once include guard In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10336 ) Change subject: msc/rrlp.h: use #pragma once include guard ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie68b2092a0a9ceae3519ab9059ac2c1e3d8d7450 Gerrit-Change-Number: 10336 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 06:56:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:56:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:56:41 +0000 Subject: Change in osmo-msc[master]: libmsc/rrlp.c: add missing include In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10337 ) Change subject: libmsc/rrlp.c: add missing include ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id33c9e5c04d61d08110ae80209f73ed14a5ef59c Gerrit-Change-Number: 10337 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 06:56:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:59:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:59:05 +0000 Subject: Change in osmo-msc[master]: RRLP: properly name the init function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10338 ) Change subject: RRLP: properly name the init function ...................................................................... Patch Set 1: the on_dso_load_* functions in old openbsc.git were actually used this way, i.e they were declared in a way that the linker produced some magic to automatically execute them at statup of the process. You don't strictly need a DSO to make __attribute__((constructor)) work. It seems this was somehow modified/disabled during the migration away from openbsc.git. Please add some historic info to the changelog -- To view, visit https://gerrit.osmocom.org/10338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24d0c9ad52f07f08176ad129878b48a591a3af6c Gerrit-Change-Number: 10338 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 05 Aug 2018 06:59:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:59:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:59:07 +0000 Subject: Change in osmo-msc[master]: msc/signal.h: use #pragma once include guard In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10335 ) Change subject: msc/signal.h: use #pragma once include guard ...................................................................... msc/signal.h: use #pragma once include guard Change-Id: I114026808abeff72a3f4f3cb1b84680c116409d4 --- M include/osmocom/msc/signal.h 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/signal.h b/include/osmocom/msc/signal.h index e854a64..f630b27 100644 --- a/include/osmocom/msc/signal.h +++ b/include/osmocom/msc/signal.h @@ -19,8 +19,7 @@ * */ -#ifndef OPENBSC_SIGNAL_H -#define OPENBSC_SIGNAL_H +#pragma once #include #include @@ -99,5 +98,3 @@ /* int paging result. Only the ones with > 0 */ int paging_result; }; - -#endif -- To view, visit https://gerrit.osmocom.org/10335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I114026808abeff72a3f4f3cb1b84680c116409d4 Gerrit-Change-Number: 10335 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:59:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:59:07 +0000 Subject: Change in osmo-msc[master]: msc/rrlp.h: use #pragma once include guard In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10336 ) Change subject: msc/rrlp.h: use #pragma once include guard ...................................................................... msc/rrlp.h: use #pragma once include guard Change-Id: Ie68b2092a0a9ceae3519ab9059ac2c1e3d8d7450 --- M include/osmocom/msc/rrlp.h 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/rrlp.h b/include/osmocom/msc/rrlp.h index c89402a..5071a7f 100644 --- a/include/osmocom/msc/rrlp.h +++ b/include/osmocom/msc/rrlp.h @@ -1,7 +1,3 @@ -#ifndef _RRLP_H -#define _RRLP_H +#pragma once void on_dso_load_rrlp(void); - -#endif /* _RRLP_H */ - -- To view, visit https://gerrit.osmocom.org/10336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie68b2092a0a9ceae3519ab9059ac2c1e3d8d7450 Gerrit-Change-Number: 10336 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:59:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:59:08 +0000 Subject: Change in osmo-msc[master]: libmsc/rrlp.c: add missing include In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10337 ) Change subject: libmsc/rrlp.c: add missing include ...................................................................... libmsc/rrlp.c: add missing include Change-Id: Id33c9e5c04d61d08110ae80209f73ed14a5ef59c --- M src/libmsc/rrlp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 9cc6b04..71e0f95 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -19,7 +19,7 @@ * */ - +#include #include #include -- To view, visit https://gerrit.osmocom.org/10337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id33c9e5c04d61d08110ae80209f73ed14a5ef59c Gerrit-Change-Number: 10337 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:59:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:59:12 +0000 Subject: Change in osmo-msc[master]: RRLP: fix: actually init the RRLP signal handlers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10339 ) Change subject: RRLP: fix: actually init the RRLP signal handlers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3618b4af48839d6d4b747be4eef2f57fa8f870c9 Gerrit-Change-Number: 10339 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 06:59:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 06:59:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 06:59:40 +0000 Subject: Change in osmo-msc[master]: RRLP: migrate and share mode definitions from msc_vty.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10340 ) Change subject: RRLP: migrate and share mode definitions from msc_vty.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9560e6eab0ad1b5d57ca732741fc0b6f61f1a4a2 Gerrit-Change-Number: 10340 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 06:59:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:00:15 +0000 Subject: Change in osmo-msc[master]: RRLP: print log when sending a position request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10341 ) Change subject: RRLP: print log when sending a position request ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10341/1/src/libmsc/rrlp.c File src/libmsc/rrlp.c: https://gerrit.osmocom.org/#/c/10341/1/src/libmsc/rrlp.c at 81 PS1, Line 81: LOGL_NOTICE NOTICE is clearly not the right level for something happening during completely normal processing of messages... -- To view, visit https://gerrit.osmocom.org/10341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 Gerrit-Change-Number: 10341 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:00:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:01:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:01:51 +0000 Subject: Change in libosmocore[master]: vty/vty.c: fix bug in vty_config_write In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10332 ) Change subject: vty/vty.c: fix bug in vty_config_write ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39050b6bf617dac10d3fccc3106f67bdcca1d05a Gerrit-Change-Number: 10332 Gerrit-PatchSet: 1 Gerrit-Owner: Mykola Shchetinin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 07:01:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:01:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:01:53 +0000 Subject: Change in libosmocore[master]: vty/vty.c: fix bug in vty_config_write In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10332 ) Change subject: vty/vty.c: fix bug in vty_config_write ...................................................................... vty/vty.c: fix bug in vty_config_write the vty_config_write function should write: line vty login to the configuration file when the login is enabled. Otherwise after saving the configuration the next login will be performed without password checking (password_check variable will be 0 though it must be 1) Change-Id: I39050b6bf617dac10d3fccc3106f67bdcca1d05a --- M src/vty/vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/vty.c b/src/vty/vty.c index aab0607..ad53537 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1694,6 +1694,8 @@ /* login */ if (!password_check) vty_out(vty, " no login%s", VTY_NEWLINE); + else + vty_out(vty, " login%s", VTY_NEWLINE); /* bind */ if (vty_bind_addr && (strcmp(vty_bind_addr, VTY_BIND_ADDR_DEFAULT) != 0)) -- To view, visit https://gerrit.osmocom.org/10332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39050b6bf617dac10d3fccc3106f67bdcca1d05a Gerrit-Change-Number: 10332 Gerrit-PatchSet: 2 Gerrit-Owner: Mykola Shchetinin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:05:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:05:38 +0000 Subject: Change in osmo-bsc[master]: GSCON: avoid sending clear when not connected In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10333 ) Change subject: GSCON: avoid sending clear when not connected ...................................................................... Patch Set 1: Code-Review-1 IMHO, the low-level BSSMAP sending functions should cotnain any checks so it's always safe to call them, no matter what the state is. This way it's easy to get things right in a generic way. It might be sufficient to check for conn==NULL (I don't know), or it might be required to actually pass the fsm_inst to the transmit functions, so they can do whatever state checks and dereference conn only in case it is valid. -- To view, visit https://gerrit.osmocom.org/10333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Gerrit-Change-Number: 10333 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:05:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:08:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:08:32 +0000 Subject: Change in osmo-bsc[master]: GSCON: fix segfault after gscon timout In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10334 ) Change subject: GSCON: fix segfault after gscon timout ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10334/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/#/c/10334/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 788 PS1, Line 788: a_reset_conn_fail(conn->sccp.msc->a.reset_fsm); it would be great if the burden of checking this is not placed on the caller. Having to think of if-constructs every time you call a function is error-prone. One option would be to provide a "msc_a_reset_conn_fail(msc)" function, which then checks if msc != NULL, and only in that case proceed to dereference it. Even if currently this is the only location where that new function is used, further development might make a developer copy the function invocation to other places, and we'd get the protection for free. Make APIs easy to use and easy to get right. -- To view, visit https://gerrit.osmocom.org/10334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Gerrit-Change-Number: 10334 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:08:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:09:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:09:05 +0000 Subject: Change in osmo-mgw[master]: network: do not patch PT of RTCP packets In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10329 ) Change subject: network: do not patch PT of RTCP packets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I55b8aa830e4e23f991373470bd04d4db12241c56 Gerrit-Change-Number: 10329 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:09:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:09:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:09:07 +0000 Subject: Change in osmo-mgw[master]: network: do not patch PT of RTCP packets In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10329 ) Change subject: network: do not patch PT of RTCP packets ...................................................................... network: do not patch PT of RTCP packets At the moment all packets that are sent with mgcp_send are fed into mgcp_patch_pt(). This functions corrects the payload type so that it matches the codec configuration on the egress side. However, this functions is only to be used with RTP packets and must not be used on RTCP packets, which we currently do because we do not check if the packet is RTCP or RTP. - Check if the packet is RTP before running mgcp_patch_pt() Change-Id: I55b8aa830e4e23f991373470bd04d4db12241c56 Related: OS#3444 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 1b1867a..6dfc5a5 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -717,11 +717,13 @@ * course unable to patch the payload type. A situation like this * should not occur if transcoding is consequently avoided. Until * we have transcoding support in osmo-mgw we can not resolve this. */ - rc = mgcp_patch_pt(conn_src, conn_dst, buf, len); - if (rc < 0) { - LOGP(DRTP, LOGL_ERROR, - "endpoint:0x%x can not patch PT because no suitable egress codec was found.\n", - ENDPOINT_NUMBER(endp)); + if (is_rtp) { + rc = mgcp_patch_pt(conn_src, conn_dst, buf, len); + if (rc < 0) { + LOGP(DRTP, LOGL_ERROR, + "endpoint:0x%x can not patch PT because no suitable egress codec was found.\n", + ENDPOINT_NUMBER(endp)); + } } /* Note: In case of loopback configuration, both, the source and the -- To view, visit https://gerrit.osmocom.org/10329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I55b8aa830e4e23f991373470bd04d4db12241c56 Gerrit-Change-Number: 10329 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:10:03 +0000 Subject: Change in osmo-mgw[master]: network: check packets before further processing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10330 ) Change subject: network: check packets before further processing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id47b9eee2164c542e6b673db24974859dd0a7618 Gerrit-Change-Number: 10330 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:10:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:10:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:10:14 +0000 Subject: Change in osmo-mgw[master]: Cosmetic: remove misplaced line break In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10331 ) Change subject: Cosmetic: remove misplaced line break ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7eea5454cb0567a4a162fb9796f889b2daa21af7 Gerrit-Change-Number: 10331 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:10:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:10:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:10:15 +0000 Subject: Change in osmo-mgw[master]: network: check packets before further processing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10330 ) Change subject: network: check packets before further processing ...................................................................... network: check packets before further processing When we receive a packet, we do not really check the contents. However, we should at least do some basic checks. - Check for short RTP packets - Check if the length field of RTCP packets seems plausible - Check if the packet type of RTCP packets makes sense (IANA) Change-Id: Id47b9eee2164c542e6b673db24974859dd0a7618 Related: OS#3444 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 69 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6dfc5a5..427f3c6 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -939,6 +940,53 @@ return 0; } +/* Do some basic checks to make sure that the RTCP packets we are going to + * process are not complete garbage */ +static int check_rtcp(char *buf, unsigned int buf_size) +{ + struct rtcp_hdr *hdr; + unsigned int len; + uint8_t type; + + /* RTPC packets that are just a header without data do not make + * any sense. */ + if (buf_size < sizeof(struct rtcp_hdr)) + return -EINVAL; + + /* Make sure that the length of the received packet does not exceed + * the available buffer size */ + hdr = (struct rtcp_hdr *)buf; + len = (osmo_ntohs(hdr->length) + 1) * 4; + if (len > buf_size) + return -EINVAL; + + /* Make sure we accept only packets that have a proper packet type set + * See also: http://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */ + type = hdr->type; + if ((type < 192 || type > 195) && (type < 200 || type > 213)) + return -EINVAL; + + return 0; +} + +/* Do some basic checks to make sure that the RTP packets we are going to + * process are not complete garbage */ +static int check_rtp(char *buf, unsigned int buf_size) +{ + /* RTP packets that are just a header without data do not make + * any sense. */ + if (buf_size < sizeof(struct rtp_hdr)) + return -EINVAL; + + /* FIXME: Add more checks, the reason why we do not check more than + * the length is because we currently handle IUUP packets as RTP + * packets, so they must pass this check, if we weould be more + * strict here, we would possibly break 3G. (see also FIXME note + * below */ + + return 0; +} + /* Receive RTP data from a specified source connection and dispatch it to a * destination connection. */ static int mgcp_recv(int *proto, struct sockaddr_in *addr, char *buf, @@ -959,8 +1007,29 @@ rc = receive_from(endp, fd->fd, addr, buf, buf_size); if (rc <= 0) return -1; + + /* FIXME: The way how we detect the protocol looks odd. We should look + * into the packet header. Also we should introduce a packet type + * MGCP_PROTO_IUUP because currently we handle IUUP packets like RTP + * packets which is problematic. */ *proto = fd == &conn->end.rtp ? MGCP_PROTO_RTP : MGCP_PROTO_RTCP; + if (*proto == MGCP_PROTO_RTP) { + if (check_rtp(buf, rc) < 0) { + LOGP(DRTP, LOGL_ERROR, + "endpoint:0x%x invalid RTP packet received -- packet tossed\n", + ENDPOINT_NUMBER(endp)); + return -1; + } + } else if (*proto == MGCP_PROTO_RTCP) { + if (check_rtcp(buf, rc) < 0) { + LOGP(DRTP, LOGL_ERROR, + "endpoint:0x%x invalid RTCP packet received -- packet tossed\n", + ENDPOINT_NUMBER(endp)); + return -1; + } + } + LOGP(DRTP, LOGL_DEBUG, "endpoint:0x%x ", ENDPOINT_NUMBER(endp)); LOGPC(DRTP, LOGL_DEBUG, "receiving from %s %s %d\n", conn->conn->name, inet_ntoa(addr->sin_addr), -- To view, visit https://gerrit.osmocom.org/10330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id47b9eee2164c542e6b673db24974859dd0a7618 Gerrit-Change-Number: 10330 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:10:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:10:15 +0000 Subject: Change in osmo-mgw[master]: Cosmetic: remove misplaced line break In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10331 ) Change subject: Cosmetic: remove misplaced line break ...................................................................... Cosmetic: remove misplaced line break Change-Id: I7eea5454cb0567a4a162fb9796f889b2daa21af7 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 427f3c6..c85a11d 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1221,7 +1221,6 @@ /* Check if the connection is in loopback mode, if yes, just send the * incoming data back to the origin */ - if (conn_src->conn->mode == MGCP_CONN_LOOPBACK) { /* When we are in loopback mode, we loop back all incoming * packets back to their origin. We will use the originating -- To view, visit https://gerrit.osmocom.org/10331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7eea5454cb0567a4a162fb9796f889b2daa21af7 Gerrit-Change-Number: 10331 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:10:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:10:36 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: prevent NULL-pointer dereference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10325 ) Change subject: gsm/gsm0480.c: prevent NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I444d95941837458b46e581298f76f3a9926c8552 Gerrit-Change-Number: 10325 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:10:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:10:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 5 Aug 2018 07:10:41 +0000 Subject: Change in osmo-msc[master]: RRLP: properly name the init function In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10338 ) Change subject: RRLP: properly name the init function ...................................................................... Patch Set 1: > the on_dso_load_* functions in old openbsc.git were actually used > this way, i.e they were declared in a way that the linker produced > some magic to automatically execute them at statup of the process. > You don't strictly need a DSO to make __attribute__((constructor)) > work. Hmm, I just checked the recent source code of OpenBSC, and as I can see 'such on_dso_load_*' functions were *called explicitly*, since 2009 year, please see: b8afe81e96a5b3ce3681482b8484788fbeb921d9. I also expected that they were called automatically... -- To view, visit https://gerrit.osmocom.org/10338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24d0c9ad52f07f08176ad129878b48a591a3af6c Gerrit-Change-Number: 10338 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 05 Aug 2018 07:10:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:11:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:11:34 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: use the local msgb allocator In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10326 ) Change subject: gsm/gsm0480.c: use the local msgb allocator ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10326/1/src/gsm/gsm0480.c File src/gsm/gsm0480.c: https://gerrit.osmocom.org/#/c/10326/1/src/gsm/gsm0480.c at 128 PS1, Line 128: s as this is a public, non-static symbol, there's no need to move the function from bottom to top. Let's not introduce unneeded changes, thanks. -- To view, visit https://gerrit.osmocom.org/10326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b Gerrit-Change-Number: 10326 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:11:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:14:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:14:01 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10328 ) Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10328/1/src/gsm/gsm48_utils.c File src/gsm/gsm48_utils.c: https://gerrit.osmocom.org/#/c/10328/1/src/gsm/gsm48_utils.c at 52 PS1, Line 52: gh->proto_discr = pdisc | (tid << 4); what if "pdisc" accidentially contains some bits in the lower nibble? I think it's safer to add a (pdisc & 0xF0) or the like. -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:14:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:14:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:14:19 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: prevent NULL-pointer dereference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10325 ) Change subject: gsm/gsm0480.c: prevent NULL-pointer dereference ...................................................................... gsm/gsm0480.c: prevent NULL-pointer dereference Change-Id: I444d95941837458b46e581298f76f3a9926c8552 --- M src/gsm/gsm0480.c 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 2d2df4a..5b51c75 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -880,7 +880,11 @@ */ struct msgb *gsm0480_gen_return_error(uint8_t invoke_id, uint8_t error_code) { - struct msgb *msg = gsm0480_msgb_alloc_name("TS 04.80 ReturnError"); + struct msgb *msg; + + msg = gsm0480_msgb_alloc_name("TS 04.80 ReturnError"); + if (!msg) + return NULL; /* First insert the problem code */ msgb_push_TLV1(msg, GSM_0480_ERROR_CODE_TAG, error_code); @@ -906,7 +910,11 @@ */ struct msgb *gsm0480_gen_reject(int invoke_id, uint8_t problem_tag, uint8_t problem_code) { - struct msgb *msg = gsm0480_msgb_alloc_name("TS 04.80 Reject"); + struct msgb *msg; + + msg = gsm0480_msgb_alloc_name("TS 04.80 Reject"); + if (!msg) + return NULL; /* First insert the problem code */ msgb_push_TLV1(msg, problem_tag, problem_code); -- To view, visit https://gerrit.osmocom.org/10325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I444d95941837458b46e581298f76f3a9926c8552 Gerrit-Change-Number: 10325 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:14:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:14:59 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: clean up the local GSM 04.80 API In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10327 ) Change subject: libmsc/gsm_09_11.c: clean up the local GSM 04.80 API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2990d8627bce0ce6afb1dcf6b11bb194292380d3 Gerrit-Change-Number: 10327 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:14:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:15:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:15:01 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: clean up the local GSM 04.80 API In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10327 ) Change subject: libmsc/gsm_09_11.c: clean up the local GSM 04.80 API ...................................................................... libmsc/gsm_09_11.c: clean up the local GSM 04.80 API Since we don't process SS/USSD requests in OsmoMSC anymore, there are some useless GSM 04.80 functions remained from the past. In particular, this change does the following: - removes both gsm0480_send_{ussd_response|return_error} functions because they are not used anymore; - changes symbol prefix from 'gsm0480_' to 'msc_', in order to avoid possible conflicts with the libosmogsm's GSM 04.80 API; - cleans up useless includes; Change-Id: I2990d8627bce0ce6afb1dcf6b11bb194292380d3 --- M include/osmocom/msc/gsm_04_80.h M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c 3 files changed, 13 insertions(+), 149 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h index 7d63088..c448c91 100644 --- a/include/osmocom/msc/gsm_04_80.h +++ b/include/osmocom/msc/gsm_04_80.h @@ -1,18 +1,10 @@ #pragma once -#include -#include -#include +#include struct gsm_subscriber_connection; -int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, - const char *response_text); -int gsm0480_send_ussd_return_error(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, - uint8_t error_code); -int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, +int msc_send_ussd_reject(struct gsm_subscriber_connection *conn, uint8_t transaction_id, int invoke_id, uint8_t problem_tag, uint8_t problem_code); diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index 32e8e23..0adf059 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -22,20 +22,14 @@ * */ - -#include -#include -#include +#include #include -#include -#include -#include #include #include +#include #include -#include #include #include @@ -48,120 +42,6 @@ return data; } -static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, - uint8_t value) -{ - uint8_t *data = msgb_push(msgb, 3); - - data[0] = tag; - data[1] = 1; - data[2] = value; - return data; -} - -static inline unsigned char *msgb_push_NULL(struct msgb *msgb) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = ASN1_NULL_TYPE_TAG; - data[1] = 0; - return data; -} - - -/*! Send a MT RELEASE COMPLETE message with USSD-response, - * wrapped into the ReturnResult component (see section 3.6.1). - * - * \param[in] conn Active subscriber connection - * \param[in] transaction_id Transaction ID with TI flag set - * \param[in] invoke_id InvokeID of the request - * \param[in] response_text The response text - * \return result of \ref msc_tx_dtap - */ -int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, - const char *response_text) -{ - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD RSP"); - struct gsm48_hdr *gh; - uint8_t *ptr8; - int response_len; - - /* First put the payload text into the message */ - ptr8 = msgb_put(msg, 0); - gsm_7bit_encode_n_ussd(ptr8, msgb_tailroom(msg), response_text, &response_len); - msgb_put(msg, response_len); - - /* Then wrap it as an Octet String */ - msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); - - /* Pre-pend the DCS octet string */ - msgb_push_TLV1(msg, ASN1_OCTET_STRING_TAG, 0x0F); - - /* Then wrap these as a Sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); - - /* Pre-pend the operation code */ - msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, - GSM0480_OP_CODE_PROCESS_USS_REQ); - - /* Wrap the operation code and IA5 string as a sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); - - /* Pre-pend the invoke ID */ - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); - - /* Wrap this up as a Return Result component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); - - /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); - - /* And finally pre-pend the L3 header */ - gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); - gh->proto_discr = GSM48_PDISC_NC_SS; - gh->proto_discr |= transaction_id << 4; - gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; - - return msc_tx_dtap(conn, msg); -} - -/*! Send a MT RELEASE COMPLETE message with ReturnError component - * (see section 3.6.1) and given error code (see section 3.6.6). - * - * \param[in] conn Active subscriber connection - * \param[in] transaction_id Transaction ID with TI flag set - * \param[in] invoke_id InvokeID of the request - * \param[in] error_code Error code (section 4.5) - * \return result of \ref msc_tx_dtap - */ -int gsm0480_send_ussd_return_error(struct gsm_subscriber_connection *conn, - uint8_t transaction_id, uint8_t invoke_id, uint8_t error_code) -{ - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD ERR"); - struct gsm48_hdr *gh; - - /* First insert the problem code */ - msgb_push_TLV1(msg, GSM_0480_ERROR_CODE_TAG, error_code); - - /* Before it insert the invoke ID */ - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); - - /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR); - - /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); - - /* And finally pre-pend the L3 header */ - gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); - gh->proto_discr = GSM48_PDISC_NC_SS; - gh->proto_discr |= transaction_id << 4; - gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; - - return msc_tx_dtap(conn, msg); -} - /*! Send a MT RELEASE COMPLETE message with Reject component * (see section 3.6.1) and given error code (see section 3.6.7). * @@ -176,27 +56,16 @@ * failed, any incorrect value can be passed (0x00 > x > 0xff), so * the universal NULL-tag (see table 3.6) will be used instead. */ -int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, +int msc_send_ussd_reject(struct gsm_subscriber_connection *conn, uint8_t transaction_id, int invoke_id, uint8_t problem_tag, uint8_t problem_code) { - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REJ"); struct gsm48_hdr *gh; + struct msgb *msg; - /* First insert the problem code */ - msgb_push_TLV1(msg, problem_tag, problem_code); - - /** - * If the Invoke ID is not available, Universal Null - * (table 3.9) with length = 0 shall be used. - */ - if (invoke_id < 0 || invoke_id > 255) - msgb_push_NULL(msg); - else - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); - - /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); + msg = gsm0480_gen_reject(invoke_id, problem_tag, problem_code); + if (!msg) + return -1; /* Wrap the component in a Facility message */ msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 9b0a9e4..01389af 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -34,6 +34,9 @@ #include #include #include + +#include +#include #include #include @@ -200,7 +203,7 @@ error: /* Abort transaction on DTAP-interface */ - gsm0480_send_ussd_reject(conn, tid, -1, + msc_send_ussd_reject(conn, tid, -1, GSM_0480_PROBLEM_CODE_TAG_GENERAL, GSM_0480_GEN_PROB_CODE_UNRECOGNISED); if (trans) -- To view, visit https://gerrit.osmocom.org/10327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2990d8627bce0ce6afb1dcf6b11bb194292380d3 Gerrit-Change-Number: 10327 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:15:22 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: separate burst preprocessing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10304 ) Change subject: trx_toolkit/burst_fwd.py: separate burst preprocessing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia7ad970593f38d9a9401975eb6dae67cd0c94e11 Gerrit-Change-Number: 10304 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:15:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:15:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:15:54 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx: introduce basic path loss simulation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10305 ) Change subject: trx_toolkit/fake_trx: introduce basic path loss simulation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib210138a03e2377c79875a4ff2f2bb58a43cfa46 Gerrit-Change-Number: 10305 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:15:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:15:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:15:55 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/burst_fwd.py: separate burst preprocessing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10304 ) Change subject: trx_toolkit/burst_fwd.py: separate burst preprocessing ...................................................................... trx_toolkit/burst_fwd.py: separate burst preprocessing This change separates burst preprocessing (i.e. both RSSI and ToA calculation) from BurstForwarder.transform_msg() because it's not actually related to the message transformation process. Change-Id: Ia7ad970593f38d9a9401975eb6dae67cd0c94e11 --- M src/target/trx_toolkit/burst_fwd.py 1 file changed, 24 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index 144ae5f..bfbe0d6 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -131,8 +131,22 @@ # Generate a random RSSI value return random.randint(rssi_min, rssi_max) + # DL burst preprocessing + def preprocess_dl_burst(self, msg): + # Calculate both RSSI and ToA values + msg.toa256 = self.calc_dl_toa256() + msg.rssi = self.calc_dl_rssi() + + # UL burst preprocessing + def preprocess_ul_burst(self, msg): + # Calculate both RSSI and ToA values, + # also apply Timing Advance + msg.toa256 = self.calc_ul_toa256() + msg.toa256 -= self.calc_ta256() + msg.rssi = self.calc_ul_rssi() + # Converts a L12TRX message to TRX2L1 message - def transform_msg(self, msg_raw, dl = True): + def transform_msg(self, msg_raw): # Attempt to parse a message try: msg_l12trx = DATAMSG_L12TRX() @@ -142,18 +156,7 @@ return None # Compose a new message for L1 - msg_trx2l1 = msg_l12trx.gen_trx2l1() - - # Randomize both RSSI and ToA values - if dl: - msg_trx2l1.toa256 = self.calc_dl_toa256() - msg_trx2l1.rssi = self.calc_dl_rssi() - else: - msg_trx2l1.toa256 = self.calc_ul_toa256() - msg_trx2l1.toa256 -= self.calc_ta256() - msg_trx2l1.rssi = self.calc_ul_rssi() - - return msg_trx2l1 + return msg_l12trx.gen_trx2l1() # Downlink handler: BTS -> BB def bts2bb(self): @@ -169,7 +172,7 @@ return None # Process a message - msg = self.transform_msg(data, dl = True) + msg = self.transform_msg(data) if msg is None: return None @@ -177,6 +180,9 @@ if msg.tn != self.ts_pass: return None + # Burst preprocessing + self.preprocess_dl_burst(msg) + # Validate and generate the payload payload = msg.gen_msg() @@ -201,10 +207,13 @@ return None # Process a message - msg = self.transform_msg(data, dl = False) + msg = self.transform_msg(data) if msg is None: return None + # Burst preprocessing + self.preprocess_ul_burst(msg) + # Validate and generate the payload payload = msg.gen_msg() -- To view, visit https://gerrit.osmocom.org/10304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia7ad970593f38d9a9401975eb6dae67cd0c94e11 Gerrit-Change-Number: 10304 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:15:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:15:55 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/fake_trx: introduce basic path loss simulation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10305 ) Change subject: trx_toolkit/fake_trx: introduce basic path loss simulation ...................................................................... trx_toolkit/fake_trx: introduce basic path loss simulation This change introduces a couple of new CTRL commands for path loss simulation, in particular a possibility to drop some amount of bursts according to some TDMA frame period, separately for both Uplink and Downlink directions. Examples: FAKE_DROP 4 - drop 4 consistent (period=1) bursts, FAKE_DROP 16 2 - drop 16 even bursts (period=2). Change-Id: Ib210138a03e2377c79875a4ff2f2bb58a43cfa46 Related: OS#3428 --- M src/target/trx_toolkit/burst_fwd.py M src/target/trx_toolkit/ctrl_if_bb.py M src/target/trx_toolkit/ctrl_if_bts.py 3 files changed, 123 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py index bfbe0d6..3834849 100644 --- a/src/target/trx_toolkit/burst_fwd.py +++ b/src/target/trx_toolkit/burst_fwd.py @@ -66,6 +66,15 @@ rssi_dl_threshold = 10 rssi_ul_threshold = 5 + # Path loss simulation: DL/UL burst dropping + # Indicates how many bursts should be dropped + # and which dropping period is used. By default, + # period is 1, i.e. every burst (fn % 1 is always 0) + burst_dl_drop_amount = 0 + burst_ul_drop_amount = 0 + burst_dl_drop_period = 1 + burst_ul_drop_period = 1 + def __init__(self, bts_link, bb_link): self.bts_link = bts_link self.bb_link = bb_link @@ -131,6 +140,30 @@ # Generate a random RSSI value return random.randint(rssi_min, rssi_max) + # DL path loss simulation + def path_loss_sim_dl(self, msg): + # Burst dropping + if self.burst_dl_drop_amount > 0: + if msg.fn % self.burst_dl_drop_period == 0: + print("[~] Simulation: dropping DL burst (fn=%u %% %u == 0)" + % (msg.fn, self.burst_dl_drop_period)) + self.burst_dl_drop_amount -= 1 + return None + + return msg + + # UL path loss simulation + def path_loss_sim_ul(self, msg): + # Burst dropping + if self.burst_ul_drop_amount > 0: + if msg.fn % self.burst_ul_drop_period == 0: + print("[~] Simulation: dropping UL burst (fn=%u %% %u == 0)" + % (msg.fn, self.burst_ul_drop_period)) + self.burst_ul_drop_amount -= 1 + return None + + return msg + # DL burst preprocessing def preprocess_dl_burst(self, msg): # Calculate both RSSI and ToA values @@ -180,6 +213,11 @@ if msg.tn != self.ts_pass: return None + # Path loss simulation + msg = self.path_loss_sim_dl(msg) + if msg is None: + return None + # Burst preprocessing self.preprocess_dl_burst(msg) @@ -211,6 +249,11 @@ if msg is None: return None + # Path loss simulation + msg = self.path_loss_sim_ul(msg) + if msg is None: + return None + # Burst preprocessing self.preprocess_ul_burst(msg) diff --git a/src/target/trx_toolkit/ctrl_if_bb.py b/src/target/trx_toolkit/ctrl_if_bb.py index 3de14ef..929caf4 100644 --- a/src/target/trx_toolkit/ctrl_if_bb.py +++ b/src/target/trx_toolkit/ctrl_if_bb.py @@ -150,6 +150,46 @@ return 0 + # Path loss simulation for UL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % 1 == 0 + elif self.verify_cmd(request, "FAKE_DROP", 1): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + self.burst_fwd.burst_ul_drop_amount = num + self.burst_fwd.burst_ul_drop_period = 1 + + return 0 + + # Path loss simulation for UL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % period == 0 + elif self.verify_cmd(request, "FAKE_DROP", 2): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + # Parse / validate period + period = int(request[2]) + if period <= 0: + print("[!] FAKE_DROP period shall be greater than zero") + return -1 + + self.burst_fwd.burst_ul_drop_amount = num + self.burst_fwd.burst_ul_drop_period = period + + return 0 + # Wrong / unknown command else: # We don't care about other commands, diff --git a/src/target/trx_toolkit/ctrl_if_bts.py b/src/target/trx_toolkit/ctrl_if_bts.py index 1488617..72a0371 100644 --- a/src/target/trx_toolkit/ctrl_if_bts.py +++ b/src/target/trx_toolkit/ctrl_if_bts.py @@ -118,6 +118,46 @@ return 0 + # Path loss simulation for DL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % 1 == 0 + elif self.verify_cmd(request, "FAKE_DROP", 1): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + self.burst_fwd.burst_dl_drop_amount = num + self.burst_fwd.burst_dl_drop_period = 1 + + return 0 + + # Path loss simulation for DL: burst dropping + # Syntax: CMD FAKE_DROP + # Dropping pattern: fn % period == 0 + elif self.verify_cmd(request, "FAKE_DROP", 2): + print("[i] Recv FAKE_DROP cmd") + + # Parse / validate amount of bursts + num = int(request[1]) + if num < 0: + print("[!] FAKE_DROP amount shall not be negative") + return -1 + + # Parse / validate period + period = int(request[2]) + if period <= 0: + print("[!] FAKE_DROP period shall be greater than zero") + return -1 + + self.burst_fwd.burst_dl_drop_amount = num + self.burst_fwd.burst_dl_drop_period = period + + return 0 + # Wrong / unknown command else: # We don't care about other commands, -- To view, visit https://gerrit.osmocom.org/10305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib210138a03e2377c79875a4ff2f2bb58a43cfa46 Gerrit-Change-Number: 10305 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:17:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:17:03 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10310 ) Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Gerrit-Change-Number: 10310 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:17:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:17:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:17:16 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10320 ) Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63 Gerrit-Change-Number: 10320 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 07:17:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:17:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:17:17 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10310 ) Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) ...................................................................... mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap) The function mgcp_write_response_sdp() generates the rtpmap lines in the sdp response. Since we will likely support multiple codecs we will need to generate several rtpmap lines. Therefore it makes sense to split up that part in a separate function without altering the overall functionality (yet) - add static function add_rtpmap() to generate the rtpmap. Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Related: OS#3442 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 20 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 102c8c3..a6def41 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -286,6 +286,24 @@ return 0; } + +/* Add rtpmap string to the sdp payload, but only when the payload type falls + * into the dynamic payload type range */ +static int add_rtpmap(struct msgb *sdp, int payload_type, const char *audio_name) +{ + int rc; + + if (payload_type >= 96 && payload_type <= 127) { + if (!audio_name) + return -EINVAL; + rc = msgb_printf(sdp, "a=rtpmap:%d %s\r\n", payload_type, audio_name); + if (rc < 0) + return -EINVAL; + } + + return 0; +} + /*! Generate SDP response string. * \param[in] endp trunk endpoint. * \param[in] conn associated rtp connection. @@ -328,12 +346,8 @@ if (rc < 0) goto buffer_too_small; - /* FIXME: Check if the payload type is from the static range, - * if yes, omitthe a=rtpmap since it is unnecessary */ - if (audio_name && endp->tcfg->audio_send_name && (payload_type >= 96 && payload_type <= 127)) { - rc = msgb_printf(sdp, "a=rtpmap:%d %s\r\n", - payload_type, audio_name); - + if (endp->tcfg->audio_send_name) { + rc = add_rtpmap(sdp, payload_type, audio_name); if (rc < 0) goto buffer_too_small; } -- To view, visit https://gerrit.osmocom.org/10310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I520e2d40fe6294c88bae63dfcbc5238ef98101e2 Gerrit-Change-Number: 10310 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 07:17:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 07:17:18 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10320 ) Change subject: mgcp_sdp: restructure mgcp_write_response_sdp() (audio) ...................................................................... mgcp_sdp: restructure mgcp_write_response_sdp() (audio) The function mgcp_write_response_sdp() is responsible to write the audio port and the list with the supported payload type numbers to the sdp response. At the moment it can only write exactly one payload type number to the response, but in the future we may want to write several payload type numbers to the response. Lets add a function for that so that now. - add add_audio() helper function to add multiple payload type numbers, but keep the functionality as it is for now Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63 Related: OS#3442 --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 30 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index a6def41..4f66e85 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -304,6 +304,32 @@ return 0; } +/* Add audio string to sdp payload */ +static int add_audio(struct msgb *sdp, int *payload_types, unsigned int payload_types_len, int local_port) +{ + int rc; + unsigned int i; + + if (payload_types_len < 0) + return -EINVAL; + + rc = msgb_printf(sdp, "m=audio %d RTP/AVP", local_port); + if (rc < 0) + return -EINVAL; + + for (i = 0; i < payload_types_len; i++) { + rc = msgb_printf(sdp, " %d", payload_types[i]); + if (rc < 0) + return -EINVAL; + } + + rc = msgb_printf(sdp, "\r\n"); + if (rc < 0) + return -EINVAL; + + return 0; +} + /*! Generate SDP response string. * \param[in] endp trunk endpoint. * \param[in] conn associated rtp connection. @@ -318,6 +344,7 @@ const char *audio_name; int payload_type; int rc; + int payload_types[1]; OSMO_ASSERT(endp); OSMO_ASSERT(conn); @@ -341,8 +368,9 @@ goto buffer_too_small; if (payload_type >= 0) { - rc = msgb_printf(sdp, "m=audio %d RTP/AVP %d\r\n", - conn->end.local_port, payload_type); + + payload_types[0] = payload_type; + rc = add_audio(sdp, payload_types, 1, conn->end.local_port); if (rc < 0) goto buffer_too_small; -- To view, visit https://gerrit.osmocom.org/10320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I662c725f697b2ffb1e3ad4671a445f943cd79b63 Gerrit-Change-Number: 10320 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 09:18:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 09:18:20 +0000 Subject: Change in osmo-msc[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10283 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10283 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 09:18:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 09:20:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 09:20:25 +0000 Subject: Change in osmo-msc[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10283 to look at the new patch set (#5). Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr osmo-hlr has recently (as of Change-Id Iad227bb477d64da30dd6bfbbe1bd0c0a55be9474) a working shared library implementation of libosmo-gsup-client. We can remove the local implementation in osmo-msc and use the system-installed shared library instead. Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 --- M .gitignore M configure.ac M contrib/jenkins.sh M debian/control M include/osmocom/msc/Makefile.am D include/osmocom/msc/gsup_client.h M include/osmocom/msc/vlr.h M src/Makefile.am D src/libgsupclient/Makefile.am D src/libgsupclient/gsup_client.c D src/libgsupclient/gsup_test_client.c M src/libmsc/Makefile.am M src/libmsc/gsm_09_11.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/osmo-msc/Makefile.am M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_tests.c M tests/sms_queue/Makefile.am 19 files changed, 39 insertions(+), 808 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/83/10283/5 -- To view, visit https://gerrit.osmocom.org/10283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10283 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 09:49:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 09:49:40 +0000 Subject: Change in osmo-msc[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10283 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10283 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 09:49:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 09:49:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 09:49:42 +0000 Subject: Change in osmo-msc[master]: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10283 ) Change subject: Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr ...................................................................... Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr osmo-hlr has recently (as of Change-Id Iad227bb477d64da30dd6bfbbe1bd0c0a55be9474) a working shared library implementation of libosmo-gsup-client. We can remove the local implementation in osmo-msc and use the system-installed shared library instead. Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 --- M .gitignore M configure.ac M contrib/jenkins.sh M debian/control M include/osmocom/msc/Makefile.am D include/osmocom/msc/gsup_client.h M include/osmocom/msc/vlr.h M src/Makefile.am D src/libgsupclient/Makefile.am D src/libgsupclient/gsup_client.c D src/libgsupclient/gsup_test_client.c M src/libmsc/Makefile.am M src/libmsc/gsm_09_11.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/osmo-msc/Makefile.am M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_tests.c M tests/sms_queue/Makefile.am 19 files changed, 39 insertions(+), 808 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 4263f5a..2424c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ # apps and app data src/osmo-msc/osmo-msc -src/libcommon/gsup_test_client src/utils/smpp_mirror sms.db src/osmo-msc/*.cfg* @@ -53,7 +52,6 @@ tests/msc_vlr/msc_vlr_test_* !tests/msc_vlr/msc_vlr_test_*.* tests/msc_vlr/msc_vlr_test_*.o -src/libgsupclient/gsup_test_client tests/atconfig diff --git a/configure.ac b/configure.ac index be66d51..03acc0c 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,7 @@ PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 0.2.1) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( @@ -193,7 +194,6 @@ src/Makefile src/libmsc/Makefile src/libvlr/Makefile - src/libgsupclient/Makefile src/osmo-msc/Makefile src/utils/Makefile tests/Makefile diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c09c368..8b8b6e7 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -30,6 +30,7 @@ osmo-build-dep.sh libosmo-sccp PARALLEL_MAKE="" osmo-build-dep.sh libsmpp34 osmo-build-dep.sh osmo-mgw +osmo-build-dep.sh osmo-hlr enable_werror="" if [ "x$IU" = "x--enable-iu" ]; then diff --git a/debian/control b/debian/control index 6219ea4..e607d10 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ libosmo-sigtran-dev (>= 0.8.0), libosmo-abis-dev, libosmo-mgcp-client-dev (>= 1.1.0), + libosmo-gsup-client-dev (>= 0.2.1), libosmo-netif-dev (>= 0.1.0), libosmo-ranap-dev (>= 0.2.0) Standards-Version: 3.9.8 diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index b1a4810..ebc946a 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -13,7 +13,6 @@ gsm_data.h \ gsm_data_shared.h \ gsm_subscriber.h \ - gsup_client.h \ iucs.h \ iucs_ranap.h \ iu_dummy.h \ diff --git a/include/osmocom/msc/gsup_client.h b/include/osmocom/msc/gsup_client.h deleted file mode 100644 index 2f6170b..0000000 --- a/include/osmocom/msc/gsup_client.h +++ /dev/null @@ -1,67 +0,0 @@ -/* GPRS Subscriber Update Protocol client */ - -/* (C) 2014 by Sysmocom s.f.m.c. GmbH - * All Rights Reserved - * - * Author: Jacob Erlbeck - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ -#pragma once - -#include - -#include - -/* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as - * possible. Even one new connection attempt per second should be quite acceptable until the link is - * re-established */ -#define GSUP_CLIENT_RECONNECT_INTERVAL 1 -#define GSUP_CLIENT_PING_INTERVAL 20 - -struct msgb; -struct ipa_client_conn; -struct gsup_client; - -/* Expects message in msg->l2h */ -typedef int (*gsup_client_read_cb_t)(struct gsup_client *gsupc, - struct msgb *msg); - -struct gsup_client { - const char *unit_name; - - struct ipa_client_conn *link; - gsup_client_read_cb_t read_cb; - void *data; - - struct osmo_oap_client_state oap_state; - - struct osmo_timer_list ping_timer; - struct osmo_timer_list connect_timer; - int is_connected; - int got_ipa_pong; -}; - -struct gsup_client *gsup_client_create(void *talloc_ctx, - const char *unit_name, - const char *ip_addr, - unsigned int tcp_port, - gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oapc_config); - -void gsup_client_destroy(struct gsup_client *gsupc); -int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg); -struct msgb *gsup_client_msgb_alloc(void); - diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index b54aa55..91c28db 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -12,6 +12,7 @@ #include // for GSM_NAME_LENGTH #include +#include #define LOGGSUPP(level, gsup, fmt, args...) \ LOGP(DVLR, level, "GSUP(%s) " fmt, (gsup)->imsi, ## args) @@ -243,7 +244,7 @@ struct vlr_instance { struct llist_head subscribers; struct llist_head operations; - struct gsup_client *gsup_client; + struct osmo_gsup_client *gsup_client; struct vlr_ops ops; struct osmo_timer_list lu_expire_timer; struct { diff --git a/src/Makefile.am b/src/Makefile.am index 2322ade..4e7cea1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,6 @@ # Libraries SUBDIRS = \ - libgsupclient \ libvlr \ libmsc \ $(NULL) diff --git a/src/libgsupclient/Makefile.am b/src/libgsupclient/Makefile.am deleted file mode 100644 index 6381687..0000000 --- a/src/libgsupclient/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -noinst_LIBRARIES = \ - libgsupclient.a \ - $(NULL) - -libgsupclient_a_SOURCES = \ - gsup_client.c \ - $(NULL) - -noinst_PROGRAMS = \ - gsup_test_client \ - $(NULL) - -gsup_test_client_SOURCES = \ - gsup_test_client.c \ - $(NULL) -gsup_test_client_LDADD = \ - libgsupclient.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - -lrt \ - $(NULL) diff --git a/src/libgsupclient/gsup_client.c b/src/libgsupclient/gsup_client.c deleted file mode 100644 index 39dc181..0000000 --- a/src/libgsupclient/gsup_client.c +++ /dev/null @@ -1,347 +0,0 @@ -/* Generic Subscriber Update Protocol client */ - -/* (C) 2014-2016 by Sysmocom s.f.m.c. GmbH - * All Rights Reserved - * - * Author: Jacob Erlbeck - * Author: Neels Hofmeyr - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include - -static void start_test_procedure(struct gsup_client *gsupc); - -static void gsup_client_send_ping(struct gsup_client *gsupc) -{ - struct msgb *msg = gsup_client_msgb_alloc(); - - msg->l2h = msgb_put(msg, 1); - msg->l2h[0] = IPAC_MSGT_PING; - ipa_msg_push_header(msg, IPAC_PROTO_IPACCESS); - ipa_client_conn_send(gsupc->link, msg); -} - -static int gsup_client_connect(struct gsup_client *gsupc) -{ - int rc; - - if (gsupc->is_connected) - return 0; - - if (osmo_timer_pending(&gsupc->connect_timer)) { - LOGP(DLGSUP, LOGL_DEBUG, - "GSUP connect: connect timer already running\n"); - osmo_timer_del(&gsupc->connect_timer); - } - - if (osmo_timer_pending(&gsupc->ping_timer)) { - LOGP(DLGSUP, LOGL_DEBUG, - "GSUP connect: ping timer already running\n"); - osmo_timer_del(&gsupc->ping_timer); - } - - if (ipa_client_conn_clear_queue(gsupc->link) > 0) - LOGP(DLGSUP, LOGL_DEBUG, "GSUP connect: discarded stored messages\n"); - - rc = ipa_client_conn_open(gsupc->link); - - if (rc >= 0) { - LOGP(DLGSUP, LOGL_NOTICE, "GSUP connecting to %s:%d\n", - gsupc->link->addr, gsupc->link->port); - return 0; - } - - LOGP(DLGSUP, LOGL_ERROR, "GSUP failed to connect to %s:%d: %s\n", - gsupc->link->addr, gsupc->link->port, strerror(-rc)); - - if (rc == -EBADF || rc == -ENOTSOCK || rc == -EAFNOSUPPORT || - rc == -EINVAL) - return rc; - - osmo_timer_schedule(&gsupc->connect_timer, - GSUP_CLIENT_RECONNECT_INTERVAL, 0); - - LOGP(DLGSUP, LOGL_INFO, "Scheduled timer to retry GSUP connect to %s:%d\n", - gsupc->link->addr, gsupc->link->port); - - return 0; -} - -static void connect_timer_cb(void *gsupc_) -{ - struct gsup_client *gsupc = gsupc_; - - if (gsupc->is_connected) - return; - - gsup_client_connect(gsupc); -} - -static void client_send(struct gsup_client *gsupc, int proto_ext, - struct msgb *msg_tx) -{ - ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); - ipa_client_conn_send(gsupc->link, msg_tx); - /* msg_tx is now queued and will be freed. */ -} - -static void gsup_client_oap_register(struct gsup_client *gsupc) -{ - struct msgb *msg_tx; - int rc; - rc = osmo_oap_client_register(&gsupc->oap_state, &msg_tx); - - if ((rc < 0) || (!msg_tx)) { - LOGP(DLGSUP, LOGL_ERROR, "GSUP OAP set up, but cannot register.\n"); - return; - } - - client_send(gsupc, IPAC_PROTO_EXT_OAP, msg_tx); -} - -static void gsup_client_updown_cb(struct ipa_client_conn *link, int up) -{ - struct gsup_client *gsupc = link->data; - - LOGP(DLGSUP, LOGL_INFO, "GSUP link to %s:%d %s\n", - link->addr, link->port, up ? "UP" : "DOWN"); - - gsupc->is_connected = up; - - if (up) { - start_test_procedure(gsupc); - - if (gsupc->oap_state.state == OSMO_OAP_INITIALIZED) - gsup_client_oap_register(gsupc); - - osmo_timer_del(&gsupc->connect_timer); - } else { - osmo_timer_del(&gsupc->ping_timer); - - osmo_timer_schedule(&gsupc->connect_timer, - GSUP_CLIENT_RECONNECT_INTERVAL, 0); - } -} - -static int gsup_client_oap_handle(struct gsup_client *gsupc, struct msgb *msg_rx) -{ - int rc; - struct msgb *msg_tx; - - /* If the oap_state is disabled, this will reject the messages. */ - rc = osmo_oap_client_handle(&gsupc->oap_state, msg_rx, &msg_tx); - msgb_free(msg_rx); - if (rc < 0) - return rc; - - if (msg_tx) - client_send(gsupc, IPAC_PROTO_EXT_OAP, msg_tx); - - return 0; -} - -static int gsup_client_read_cb(struct ipa_client_conn *link, struct msgb *msg) -{ - struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; - struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); - struct gsup_client *gsupc = (struct gsup_client *)link->data; - int rc; - struct ipaccess_unit ipa_dev = { - /* see gsup_client_create() on const vs non-const */ - .unit_name = (char*)gsupc->unit_name, - }; - - OSMO_ASSERT(ipa_dev.unit_name); - - msg->l2h = &hh->data[0]; - - rc = ipaccess_bts_handle_ccm(link, &ipa_dev, msg); - - if (rc < 0) { - LOGP(DLGSUP, LOGL_NOTICE, - "GSUP received an invalid IPA/CCM message from %s:%d\n", - link->addr, link->port); - /* Link has been closed */ - gsupc->is_connected = 0; - msgb_free(msg); - return -1; - } - - if (rc == 1) { - uint8_t msg_type = *(msg->l2h); - /* CCM message */ - if (msg_type == IPAC_MSGT_PONG) { - LOGP(DLGSUP, LOGL_DEBUG, "GSUP receiving PONG\n"); - gsupc->got_ipa_pong = 1; - } - - msgb_free(msg); - return 0; - } - - if (hh->proto != IPAC_PROTO_OSMO) - goto invalid; - - if (!he || msgb_l2len(msg) < sizeof(*he)) - goto invalid; - - msg->l2h = &he->data[0]; - - if (he->proto == IPAC_PROTO_EXT_GSUP) { - OSMO_ASSERT(gsupc->read_cb != NULL); - gsupc->read_cb(gsupc, msg); - /* expecting read_cb() to free msg */ - } else if (he->proto == IPAC_PROTO_EXT_OAP) { - return gsup_client_oap_handle(gsupc, msg); - /* gsup_client_oap_handle frees msg */ - } else - goto invalid; - - return 0; - -invalid: - LOGP(DLGSUP, LOGL_NOTICE, - "GSUP received an invalid IPA message from %s:%d, size = %d\n", - link->addr, link->port, msgb_length(msg)); - - msgb_free(msg); - return -1; -} - -static void ping_timer_cb(void *gsupc_) -{ - struct gsup_client *gsupc = gsupc_; - - LOGP(DLGSUP, LOGL_INFO, "GSUP ping callback (%s, %s PONG)\n", - gsupc->is_connected ? "connected" : "not connected", - gsupc->got_ipa_pong ? "got" : "didn't get"); - - if (gsupc->got_ipa_pong) { - start_test_procedure(gsupc); - return; - } - - LOGP(DLGSUP, LOGL_NOTICE, "GSUP ping timed out, reconnecting\n"); - ipa_client_conn_close(gsupc->link); - gsupc->is_connected = 0; - - gsup_client_connect(gsupc); -} - -static void start_test_procedure(struct gsup_client *gsupc) -{ - osmo_timer_setup(&gsupc->ping_timer, ping_timer_cb, gsupc); - - gsupc->got_ipa_pong = 0; - osmo_timer_schedule(&gsupc->ping_timer, GSUP_CLIENT_PING_INTERVAL, 0); - LOGP(DLGSUP, LOGL_DEBUG, "GSUP sending PING\n"); - gsup_client_send_ping(gsupc); -} - -struct gsup_client *gsup_client_create(void *talloc_ctx, - const char *unit_name, - const char *ip_addr, - unsigned int tcp_port, - gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oapc_config) -{ - struct gsup_client *gsupc; - int rc; - - gsupc = talloc_zero(talloc_ctx, struct gsup_client); - OSMO_ASSERT(gsupc); - - /* struct ipaccess_unit has a non-const unit_name, so let's copy to be - * able to have a non-const unit_name here as well. To not taint the - * public gsup_client API, let's store it in a const char* anyway. */ - gsupc->unit_name = talloc_strdup(gsupc, unit_name); - OSMO_ASSERT(gsupc->unit_name); - - /* a NULL oapc_config will mark oap_state disabled. */ - rc = osmo_oap_client_init(oapc_config, &gsupc->oap_state); - if (rc != 0) - goto failed; - - gsupc->link = ipa_client_conn_create(gsupc, - /* no e1inp */ NULL, - 0, - ip_addr, tcp_port, - gsup_client_updown_cb, - gsup_client_read_cb, - /* default write_cb */ NULL, - gsupc); - if (!gsupc->link) - goto failed; - - osmo_timer_setup(&gsupc->connect_timer, connect_timer_cb, gsupc); - - rc = gsup_client_connect(gsupc); - - if (rc < 0) - goto failed; - - gsupc->read_cb = read_cb; - - return gsupc; - -failed: - gsup_client_destroy(gsupc); - return NULL; -} - -void gsup_client_destroy(struct gsup_client *gsupc) -{ - osmo_timer_del(&gsupc->connect_timer); - osmo_timer_del(&gsupc->ping_timer); - - if (gsupc->link) { - ipa_client_conn_close(gsupc->link); - ipa_client_conn_destroy(gsupc->link); - gsupc->link = NULL; - } - talloc_free(gsupc); -} - -int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) -{ - if (!gsupc || !gsupc->is_connected) { - LOGP(DLGSUP, LOGL_ERROR, "GSUP not connected, unable to send %s\n", msgb_hexdump(msg)); - msgb_free(msg); - return -ENOTCONN; - } - - client_send(gsupc, IPAC_PROTO_EXT_GSUP, msg); - - return 0; -} - -struct msgb *gsup_client_msgb_alloc(void) -{ - return msgb_alloc_headroom(4000, 64, __func__); -} diff --git a/src/libgsupclient/gsup_test_client.c b/src/libgsupclient/gsup_test_client.c deleted file mode 100644 index 0ebcd4a..0000000 --- a/src/libgsupclient/gsup_test_client.c +++ /dev/null @@ -1,321 +0,0 @@ -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -static struct gsup_client *g_gc; - - -/*********************************************************************** - * IMSI Operation - ***********************************************************************/ -static LLIST_HEAD(g_imsi_ops); - -struct imsi_op_stats { - uint32_t num_alloc; - uint32_t num_released; - uint32_t num_rx_success; - uint32_t num_rx_error; - uint32_t num_timeout; -}; - -enum imsi_op_type { - IMSI_OP_SAI, - IMSI_OP_LU, - IMSI_OP_ISD, - _NUM_IMSI_OP -}; - -static const struct value_string imsi_op_names[] = { - { IMSI_OP_SAI, "SAI" }, - { IMSI_OP_LU, "LU" }, - { IMSI_OP_ISD, "ISD" }, - { 0, NULL } -}; - -static struct imsi_op_stats imsi_op_stats[_NUM_IMSI_OP]; - -struct imsi_op { - struct llist_head list; - char imsi[17]; - enum imsi_op_type type; - struct osmo_timer_list timer; -}; - -static struct imsi_op *imsi_op_find(const char *imsi, - enum imsi_op_type type) -{ - struct imsi_op *io; - - llist_for_each_entry(io, &g_imsi_ops, list) { - if (!strcmp(io->imsi, imsi) && io->type == type) - return io; - } - return NULL; -} - -static void imsi_op_timer_cb(void *data); - -static struct imsi_op *imsi_op_alloc(void *ctx, const char *imsi, - enum imsi_op_type type) -{ - struct imsi_op *io; - - if (imsi_op_find(imsi, type)) - return NULL; - - io = talloc_zero(ctx, struct imsi_op); - OSMO_STRLCPY_ARRAY(io->imsi, imsi); - io->type = type; - osmo_timer_setup(&io->timer, imsi_op_timer_cb, io); - llist_add(&io->list, &g_imsi_ops); - imsi_op_stats[type].num_alloc++; - - return io; -} - -static void imsi_op_release(struct imsi_op *io) -{ - osmo_timer_del(&io->timer); - llist_del(&io->list); - imsi_op_stats[io->type].num_released++; - talloc_free(io); -} - -static void imsi_op_timer_cb(void *data) -{ - struct imsi_op *io = data; - printf("%s: Timer expiration\n", io->imsi); - imsi_op_stats[io->type].num_timeout++; - imsi_op_release(io); -} - -/* allocate + generate + send Send-Auth-Info */ -static int req_auth_info(const char *imsi) -{ - struct imsi_op *io = imsi_op_alloc(g_gc, imsi, IMSI_OP_SAI); - struct osmo_gsup_message gsup = {0}; - struct msgb *msg = msgb_alloc_headroom(1200, 200, __func__); - int rc; - - OSMO_STRLCPY_ARRAY(gsup.imsi, io->imsi); - gsup.message_type = OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST; - - rc = osmo_gsup_encode(msg, &gsup); - if (rc < 0) { - printf("%s: encoding failure (%s)\n", imsi, strerror(-rc)); - return rc; - } - - return gsup_client_send(g_gc, msg); -} - -/* allocate + generate + send Send-Auth-Info */ -static int req_loc_upd(const char *imsi) -{ - struct imsi_op *io = imsi_op_alloc(g_gc, imsi, IMSI_OP_LU); - struct osmo_gsup_message gsup = {0}; - struct msgb *msg = msgb_alloc_headroom(1200, 200, __func__); - int rc; - - OSMO_STRLCPY_ARRAY(gsup.imsi, io->imsi); - gsup.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST; - - rc = osmo_gsup_encode(msg, &gsup); - if (rc < 0) { - printf("%s: encoding failure (%s)\n", imsi, strerror(-rc)); - return rc; - } - - return gsup_client_send(g_gc, msg); -} - -static int resp_isd(struct imsi_op *io) -{ - struct osmo_gsup_message gsup = {0}; - struct msgb *msg = msgb_alloc_headroom(1200, 200, __func__); - int rc; - - OSMO_STRLCPY_ARRAY(gsup.imsi, io->imsi); - gsup.message_type = OSMO_GSUP_MSGT_INSERT_DATA_RESULT; - - rc = osmo_gsup_encode(msg, &gsup); - if (rc < 0) { - printf("%s: encoding failure (%s)\n", io->imsi, strerror(-rc)); - return rc; - } - - imsi_op_release(io); - - return gsup_client_send(g_gc, msg); -} - -/* receive an incoming GSUP message */ -static void imsi_op_rx_gsup(struct imsi_op *io, const struct osmo_gsup_message *gsup) -{ - int is_error = 0, rc; - - if (OSMO_GSUP_IS_MSGT_ERROR(gsup->message_type)) { - imsi_op_stats[io->type].num_rx_error++; - is_error = 1; - } else - imsi_op_stats[io->type].num_rx_success++; - - switch (io->type) { - case IMSI_OP_SAI: - printf("%s; SAI Response%s\n", io->imsi, is_error ? ": ERROR" : ""); - /* now that we have auth tuples, request LU */ - rc = req_loc_upd(io->imsi); - if (rc < 0) - printf("Failed to request Location Update for %s\n", io->imsi); - imsi_op_release(io); - break; - case IMSI_OP_LU: - printf("%s; LU Response%s\n", io->imsi, is_error ? ": ERROR" : ""); - imsi_op_release(io); - break; - case IMSI_OP_ISD: - printf("%s; ISD Request%s\n", io->imsi, is_error ? ": ERROR" : ""); - rc = resp_isd(io); - if (rc < 0) - printf("Failed to insert subscriber data for %s\n", io->imsi); - break; - default: - printf("%s: Unknown\n", io->imsi); - imsi_op_release(io); - break; - } -} - -static int op_type_by_gsup_msgt(enum osmo_gsup_message_type msg_type) -{ - switch (msg_type) { - case OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: - case OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR: - return IMSI_OP_SAI; - case OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: - case OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR: - return IMSI_OP_LU; - case OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: - return IMSI_OP_ISD; - default: - printf("Unknown GSUP msg_type %u\n", msg_type); - return -1; - } -} - -static int gsupc_read_cb(struct gsup_client *gsupc, struct msgb *msg) -{ - struct osmo_gsup_message gsup_msg = {0}; - struct imsi_op *io = NULL; - int rc; - - DEBUGP(DLGSUP, "Rx GSUP %s\n", msgb_hexdump(msg)); - - rc = osmo_gsup_decode(msgb_l2(msg), msgb_l2len(msg), &gsup_msg); - if (rc < 0) - return rc; - - if (!gsup_msg.imsi[0]) - return -1; - - rc = op_type_by_gsup_msgt(gsup_msg.message_type); - if (rc < 0) - return rc; - - switch (rc) { - case IMSI_OP_SAI: - case IMSI_OP_LU: - io = imsi_op_find(gsup_msg.imsi, rc); - break; - case IMSI_OP_ISD: - /* ISD is an inbound transaction */ - io = imsi_op_alloc(g_gc, gsup_msg.imsi, IMSI_OP_ISD); - break; - } - if (!io) - return -1; - - imsi_op_rx_gsup(io, &gsup_msg); - msgb_free(msg); - - return 0; -} - -static void print_report(void) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(imsi_op_stats); i++) { - struct imsi_op_stats *st = &imsi_op_stats[i]; - const char *name = get_value_string(imsi_op_names, i); - printf("%s: %u alloc, %u released, %u success, %u error , %u tout\n", - name, st->num_alloc, st->num_released, st->num_rx_success, - st->num_rx_error, st->num_timeout); - } -} - -static void sig_cb(int sig) -{ - switch (sig) { - case SIGINT: - print_report(); - exit(0); - break; - } -} - -/* default categories */ -static struct log_info_cat default_categories[] = { -}; - -static const struct log_info gsup_test_client_log_info = { - .cat = default_categories, - .num_cat = ARRAY_SIZE(default_categories), -}; - -int main(int argc, char **argv) -{ - unsigned long long i; - char *server_host = "127.0.0.1"; - uint16_t server_port = OSMO_GSUP_PORT; - void *ctx = talloc_named_const(NULL, 0, "gsup_test_client"); - - osmo_init_logging2(ctx, &gsup_test_client_log_info); - - g_gc = gsup_client_create(ctx, "GSUPTEST", server_host, server_port, - gsupc_read_cb, NULL); - - - signal(SIGINT, sig_cb); - - for (i = 0; i < 10000; i++) { - unsigned long long imsi = 901790000000000 + i; - char imsi_buf[17] = { 0 }; - int rc; - - snprintf(imsi_buf, sizeof(imsi_buf), "%015llu", imsi); - rc = req_auth_info(imsi_buf); - if (rc < 0) - printf("Failed to request Auth Info for %s\n", imsi_buf); - - osmo_select_main(0); - } - - while (1) { - osmo_select_main(0); - } - - print_report(); - exit(0); -} diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index a2560ea..90bbbf8 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -15,6 +15,7 @@ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ $(NULL) diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 01389af..b863ce8 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include /* FIXME: choose a proper range */ @@ -168,7 +168,7 @@ OSMO_STRLCPY_ARRAY(gsup_msg.imsi, conn->vsub->imsi); /* Allocate GSUP message buffer */ - gsup_msgb = gsup_client_msgb_alloc(); + gsup_msgb = osmo_gsup_client_msgb_alloc(); if (!gsup_msgb) { LOGP(DMM, LOGL_ERROR, "Couldn't allocate GSUP message\n"); rc = -ENOMEM; @@ -183,7 +183,7 @@ } /* Finally send */ - rc = gsup_client_send(conn->network->vlr->gsup_client, gsup_msgb); + rc = osmo_gsup_client_send(conn->network->vlr->gsup_client, gsup_msgb); if (rc) { LOGP(DMM, LOGL_ERROR, "Couldn't send GSUP message\n"); goto error; diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 1408f6c..dcae1c7 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -5,6 +5,7 @@ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ $(COVERAGE_CFLAGS) \ diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 2f7dc30..bfaf333 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -156,7 +156,7 @@ static int vlr_tx_gsup_message(const struct vlr_instance *vlr, const struct osmo_gsup_message *gsup_msg) { - struct msgb *msg = gsup_client_msgb_alloc(); + struct msgb *msg = osmo_gsup_client_msgb_alloc(); int rc = osmo_gsup_encode(msg, gsup_msg); if (rc < 0) { @@ -174,7 +174,7 @@ LOGP(DVLR, LOGL_DEBUG, "GSUP tx: %s\n", osmo_hexdump_nospc(msg->data, msg->len)); - return gsup_client_send(vlr->gsup_client, msg); + return osmo_gsup_client_send(vlr->gsup_client, msg); } /* Transmit GSUP message for subscriber to HLR, using IMSI from subscriber */ @@ -974,7 +974,7 @@ /* Incoming handler for GSUP from HLR. * Keep this function non-static for direct invocation by unit tests. */ -int vlr_gsupc_read_cb(struct gsup_client *gsupc, struct msgb *msg) +int vlr_gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg) { struct vlr_instance *vlr = (struct vlr_instance *) gsupc->data; struct vlr_subscr *vsub; @@ -1214,10 +1214,10 @@ { OSMO_ASSERT(vlr); - vlr->gsup_client = gsup_client_create(vlr, gsup_unit_name, - gsup_server_addr_str, - gsup_server_port, - &vlr_gsupc_read_cb, NULL); + vlr->gsup_client = osmo_gsup_client_create(vlr, gsup_unit_name, + gsup_server_addr_str, + gsup_server_port, + &vlr_gsupc_read_cb, NULL); if (!vlr->gsup_client) return -ENOMEM; vlr->gsup_client->data = vlr; diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am index 42bc69f..bcc4ada 100644 --- a/src/osmo-msc/Makefile.am +++ b/src/osmo-msc/Makefile.am @@ -17,6 +17,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -34,7 +35,6 @@ osmo_msc_LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libvlr/libvlr.a \ - $(top_builddir)/src/libgsupclient/libgsupclient.a \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOCORE_LIBS) \ @@ -43,6 +43,7 @@ $(LIBSMPP34_LIBS) \ $(LIBOSMOSIGTRAN_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ -ldbi \ $(NULL) if BUILD_IU diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index 8b29f79..e6b20e6 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -15,11 +15,12 @@ $(LIBOSMORANAP_CFLAGS) \ $(LIBASN1C_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(NULL) AM_LDFLAGS = \ - -Wl,--wrap=gsup_client_create \ - -Wl,--wrap=gsup_client_send \ + -Wl,--wrap=osmo_gsup_client_create \ + -Wl,--wrap=osmo_gsup_client_send \ -Wl,--wrap=a_iface_tx_dtap \ -Wl,--wrap=a_iface_tx_clear_cmd \ -Wl,--wrap=a_iface_tx_paging \ @@ -39,7 +40,6 @@ LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libvlr/libvlr.a \ - $(top_builddir)/src/libgsupclient/libgsupclient.a \ $(LIBSMPP34_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ @@ -48,6 +48,7 @@ $(LIBOSMOSIGTRAN_LIBS) \ $(LIBOSMORANAP_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ $(LIBRARY_GSM) \ -ldbi \ -lrt \ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 1488109..f8551dd 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -138,7 +138,7 @@ dtap_tx_confirmed = false; } -int vlr_gsupc_read_cb(struct gsup_client *gsupc, struct msgb *msg); +int vlr_gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg); void gsup_rx(const char *rx_hex, const char *expect_tx_hex) { @@ -494,24 +494,24 @@ } /* override, requires '-Wl,--wrap=gsup_client_create' */ -struct gsup_client * -__real_gsup_client_create(const char *ip_addr, unsigned int tcp_port, - gsup_client_read_cb_t read_cb, +struct osmo_gsup_client * +__real_osmo_gsup_client_create(const char *ip_addr, unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, struct osmo_oap_client_config *oap_config); -struct gsup_client * -__wrap_gsup_client_create(const char *ip_addr, unsigned int tcp_port, - gsup_client_read_cb_t read_cb, +struct osmo_gsup_client * +__wrap_osmo_gsup_client_create(const char *ip_addr, unsigned int tcp_port, + osmo_gsup_client_read_cb_t read_cb, struct osmo_oap_client_config *oap_config) { - struct gsup_client *gsupc; - gsupc = talloc_zero(msc_vlr_tests_ctx, struct gsup_client); + struct osmo_gsup_client *gsupc; + gsupc = talloc_zero(msc_vlr_tests_ctx, struct osmo_gsup_client); OSMO_ASSERT(gsupc); return gsupc; } /* override, requires '-Wl,--wrap=gsup_client_send' */ -int __real_gsup_client_send(struct gsup_client *gsupc, struct msgb *msg); -int __wrap_gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) +int __real_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg); +int __wrap_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg) { const char *is = osmo_hexdump_nospc(msg->data, msg->len); fprintf(stderr, "GSUP --> HLR: %s: %s\n", @@ -831,7 +831,7 @@ /* Expecting these to stick around in msc_vlr_tests_ctx: * talloc_total_blocks(tall_bsc_ctx) == 12 * full talloc report on 'msc_vlr_tests_ctx' (total 3636 bytes in 12 blocks) - * struct gsup_client contains 248 bytes in 1 blocks (ref 0) 0x563a489c05f0 + * struct osmo_gsup_client contains 248 bytes in 1 blocks (ref 0) 0x563a489c05f0 * struct gsm_network contains 2031 bytes in 4 blocks (ref 0) 0x563a489bfbb0 * struct vlr_instance contains 168 bytes in 1 blocks (ref 0) 0x563a489c04e0 * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x563a489c0460 diff --git a/tests/sms_queue/Makefile.am b/tests/sms_queue/Makefile.am index 61b8515..1ffbe1c 100644 --- a/tests/sms_queue/Makefile.am +++ b/tests/sms_queue/Makefile.am @@ -14,6 +14,7 @@ $(LIBOSMORANAP_CFLAGS) \ $(LIBASN1C_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(NULL) EXTRA_DIST = \ @@ -32,7 +33,6 @@ sms_queue_test_LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libvlr/libvlr.a \ - $(top_builddir)/src/libgsupclient/libgsupclient.a \ $(LIBSMPP34_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ @@ -41,6 +41,7 @@ $(LIBOSMOSIGTRAN_LIBS) \ $(LIBOSMORANAP_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ $(LIBRARY_GSM) \ -ldbi \ -lrt \ -- To view, visit https://gerrit.osmocom.org/10283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69 Gerrit-Change-Number: 10283 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 11:21:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 5 Aug 2018 11:21:28 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10328 ) Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10328/1/src/gsm/gsm48_utils.c File src/gsm/gsm48_utils.c: https://gerrit.osmocom.org/#/c/10328/1/src/gsm/gsm48_utils.c at 52 PS1, Line 52: gh->proto_discr = pdisc | (tid << 4); > what if "pdisc" accidentially contains some bits in the lower nibble? I think it's safer to add a ( [?] Yep, makes sense... But after looking at some other messages, which may have no transaction ID, I think it would be more flexible to leave it up to caller, i.e. accept a single value instead of separate pdisc and tid... What do you think? -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 11:21:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 11:32:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 11:32:35 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10328 ) Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10328/1/src/gsm/gsm48_utils.c File src/gsm/gsm48_utils.c: https://gerrit.osmocom.org/#/c/10328/1/src/gsm/gsm48_utils.c at 52 PS1, Line 52: gh->proto_discr = pdisc | (tid << 4); > Yep, makes sense... [?] makes sense to use only a single value. call it "pdisc_tid" or the like. -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 11:32:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 11:33:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 11:33:12 +0000 Subject: Change in osmo-msc[master]: RRLP: properly name the init function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10338 ) Change subject: RRLP: properly name the init function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24d0c9ad52f07f08176ad129878b48a591a3af6c Gerrit-Change-Number: 10338 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 11:33:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 11:33:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 11:33:20 +0000 Subject: Change in osmo-msc[master]: RRLP: properly name the init function In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10338 ) Change subject: RRLP: properly name the init function ...................................................................... RRLP: properly name the init function We don't actually deal with DSO loading here... Change-Id: I24d0c9ad52f07f08176ad129878b48a591a3af6c --- M include/osmocom/msc/rrlp.h M src/libmsc/rrlp.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/rrlp.h b/include/osmocom/msc/rrlp.h index 5071a7f..319af70 100644 --- a/include/osmocom/msc/rrlp.h +++ b/include/osmocom/msc/rrlp.h @@ -1,3 +1,3 @@ #pragma once -void on_dso_load_rrlp(void); +void msc_rrlp_init(void); diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 71e0f95..42f5036 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -96,7 +96,7 @@ return 0; } -void on_dso_load_rrlp(void) +void msc_rrlp_init(void) { osmo_signal_register_handler(SS_SUBSCR, subscr_sig_cb, NULL); osmo_signal_register_handler(SS_PAGING, paging_sig_cb, NULL); -- To view, visit https://gerrit.osmocom.org/10338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I24d0c9ad52f07f08176ad129878b48a591a3af6c Gerrit-Change-Number: 10338 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 11:33:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 11:33:20 +0000 Subject: Change in osmo-msc[master]: RRLP: fix: actually init the RRLP signal handlers In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10339 ) Change subject: RRLP: fix: actually init the RRLP signal handlers ...................................................................... RRLP: fix: actually init the RRLP signal handlers Change-Id: I3618b4af48839d6d4b747be4eef2f57fa8f870c9 Closes: OS#3129 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index b83691f..aa06fb9 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -681,6 +681,9 @@ /* Set up A interface */ a_init(msc_network->a.sccp, msc_network); + /* Init RRLP handlers */ + msc_rrlp_init(); + if (msc_cmdline_config.daemonize) { rc = osmo_daemonize(); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/10339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3618b4af48839d6d4b747be4eef2f57fa8f870c9 Gerrit-Change-Number: 10339 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 11:33:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 11:33:20 +0000 Subject: Change in osmo-msc[master]: RRLP: migrate and share mode definitions from msc_vty.c In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10340 ) Change subject: RRLP: migrate and share mode definitions from msc_vty.c ...................................................................... RRLP: migrate and share mode definitions from msc_vty.c Change-Id: I9560e6eab0ad1b5d57ca732741fc0b6f61f1a4a2 --- M include/osmocom/msc/rrlp.h M src/libmsc/msc_vty.c M src/libmsc/rrlp.c 3 files changed, 28 insertions(+), 20 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/rrlp.h b/include/osmocom/msc/rrlp.h index 319af70..7d1369d 100644 --- a/include/osmocom/msc/rrlp.h +++ b/include/osmocom/msc/rrlp.h @@ -1,3 +1,8 @@ #pragma once +#include + +enum rrlp_mode msc_rrlp_mode_parse(const char *arg); +const char *msc_rrlp_mode_name(enum rrlp_mode mode); + void msc_rrlp_init(void); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 3cbb001..fe6ae88 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -53,6 +53,7 @@ #include #include #include +#include static struct gsm_network *gsmnet = NULL; @@ -161,24 +162,6 @@ return CMD_SUCCESS; } -static const struct value_string rrlp_mode_names[] = { - { RRLP_MODE_NONE, "none" }, - { RRLP_MODE_MS_BASED, "ms-based" }, - { RRLP_MODE_MS_PREF, "ms-preferred" }, - { RRLP_MODE_ASS_PREF, "ass-preferred" }, - { 0, NULL } -}; - -static enum rrlp_mode rrlp_mode_parse(const char *arg) -{ - return get_string_value(rrlp_mode_names, arg); -} - -static const char *rrlp_mode_name(enum rrlp_mode mode) -{ - return get_value_string(rrlp_mode_names, mode); -} - DEFUN(cfg_net_rrlp_mode, cfg_net_rrlp_mode_cmd, "rrlp mode (none|ms-based|ms-preferred|ass-preferred)", "Radio Resource Location Protocol\n" @@ -188,7 +171,7 @@ "Request any location, prefer MS-based\n" "Request any location, prefer MS-assisted\n") { - gsmnet->rrlp.mode = rrlp_mode_parse(argv[0]); + gsmnet->rrlp.mode = msc_rrlp_mode_parse(argv[0]); return CMD_SUCCESS; } @@ -311,7 +294,7 @@ vty_out(vty, "%s", VTY_NEWLINE); vty_out(vty, " authentication %s%s", gsmnet->authentication_required ? "required" : "optional", VTY_NEWLINE); - vty_out(vty, " rrlp mode %s%s", rrlp_mode_name(gsmnet->rrlp.mode), + vty_out(vty, " rrlp mode %s%s", msc_rrlp_mode_name(gsmnet->rrlp.mode), VTY_NEWLINE); vty_out(vty, " mm info %u%s", gsmnet->send_mm_info, VTY_NEWLINE); if (gsmnet->tz.override != 0) { diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 42f5036..40a0a10 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -37,6 +39,24 @@ Accuracy=60, Method=gpsOrEOTD, ResponseTime=5, multipleSets */ static const uint8_t ass_pref_pos_req[] = { 0x40, 0x03, 0x79, 0x50 }; +static const struct value_string rrlp_mode_names[] = { + { RRLP_MODE_NONE, "none" }, + { RRLP_MODE_MS_BASED, "ms-based" }, + { RRLP_MODE_MS_PREF, "ms-preferred" }, + { RRLP_MODE_ASS_PREF, "ass-preferred" }, + { 0, NULL } +}; + +enum rrlp_mode msc_rrlp_mode_parse(const char *arg) +{ + return get_string_value(rrlp_mode_names, arg); +} + +const char *msc_rrlp_mode_name(enum rrlp_mode mode) +{ + return get_value_string(rrlp_mode_names, mode); +} + static int send_rrlp_req(struct gsm_subscriber_connection *conn) { struct gsm_network *net = conn->network; -- To view, visit https://gerrit.osmocom.org/10340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9560e6eab0ad1b5d57ca732741fc0b6f61f1a4a2 Gerrit-Change-Number: 10340 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:39:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 5 Aug 2018 15:39:50 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: use the local msgb allocator In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10326 to look at the new patch set (#2). Change subject: gsm/gsm0480.c: use the local msgb allocator ...................................................................... gsm/gsm0480.c: use the local msgb allocator Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b --- M src/gsm/gsm0480.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/10326/2 -- To view, visit https://gerrit.osmocom.org/10326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b Gerrit-Change-Number: 10326 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:39:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 5 Aug 2018 15:39:50 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10328 to look at the new patch set (#2). Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... libosmogsm: (re)introduce gsm48_push_l3hdr() There was gsm0480_l3hdr_push() declared in a header file, but not exposed in 'libosmogsm.map'. Furthermore, for some reason it was a part of GSM 04.80 API, what is not actually correct. Let's rename this symbol, and properly expose it as a part of the new GSM 04.08 auxiliary API, i.e. in a separate header. Also, let's introduce an auxiliary wrapper for messages, where the transaction identifier is required (see GSM 04.07, section 11.2.3.1.2). Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda --- M TODO-RELEASE M include/Makefile.am M include/osmocom/gsm/gsm0480.h A include/osmocom/gsm/gsm48_utils.h M src/gsm/Makefile.am M src/gsm/gsm0411_utils.c M src/gsm/gsm0480.c A src/gsm/gsm48_utils.c M src/gsm/libosmogsm.map 9 files changed, 89 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/10328/2 -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:42:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 5 Aug 2018 15:42:21 +0000 Subject: Change in osmo-msc[master]: RRLP: print log when sending a position request In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10341 to look at the new patch set (#2). Change subject: RRLP: print log when sending a position request ...................................................................... RRLP: print log when sending a position request Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 --- M src/libmsc/rrlp.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/10341/2 -- To view, visit https://gerrit.osmocom.org/10341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 Gerrit-Change-Number: 10341 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:57:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 15:57:10 +0000 Subject: Change in osmo-msc[master]: RRLP: print log when sending a position request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10341 ) Change subject: RRLP: print log when sending a position request ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 Gerrit-Change-Number: 10341 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 15:57:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 15:57:12 +0000 Subject: Change in osmo-msc[master]: RRLP: print log when sending a position request In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10341 ) Change subject: RRLP: print log when sending a position request ...................................................................... RRLP: print log when sending a position request Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 --- M src/libmsc/rrlp.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 40a0a10..2a5c1aa 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -25,6 +25,7 @@ #include #include +#include #include /* RRLP msPositionReq, nsBased, @@ -77,6 +78,9 @@ return 0; } + LOGP(DRR, LOGL_INFO, "Sending '%s' RRLP position request\n", + msc_rrlp_mode_name(net->rrlp.mode)); + return gsm48_send_rr_app_info(conn, 0x00, sizeof(ms_based_pos_req), req); } -- To view, visit https://gerrit.osmocom.org/10341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia2446e05f63ac219f630ab9db1ea9bf305f0a4b9 Gerrit-Change-Number: 10341 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:57:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 15:57:22 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: use the local msgb allocator In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10326 ) Change subject: gsm/gsm0480.c: use the local msgb allocator ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b Gerrit-Change-Number: 10326 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Aug 2018 15:57:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:57:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 15:57:24 +0000 Subject: Change in libosmocore[master]: gsm/gsm0480.c: use the local msgb allocator In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10326 ) Change subject: gsm/gsm0480.c: use the local msgb allocator ...................................................................... gsm/gsm0480.c: use the local msgb allocator Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b --- M src/gsm/gsm0480.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 5b51c75..df640b8 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -131,7 +131,7 @@ uint8_t *seq_len_ptr, *ussd_len_ptr, *data; int len; - msg = msgb_alloc_headroom(1024, 128, "GSM 04.80"); + msg = gsm0480_msgb_alloc_name("TS 04.80 USSD Notify"); if (!msg) return NULL; @@ -177,7 +177,7 @@ if (len < 1 || len > 160) return NULL; - msg = msgb_alloc_headroom(1024, 128, "GSM 04.80"); + msg = gsm0480_msgb_alloc_name("TS 04.80 NotifySS"); if (!msg) return NULL; @@ -962,7 +962,7 @@ { struct msgb *msg; - msg = msgb_alloc_headroom(1024, 128, "GSM 04.80 USSD REL COMPL"); + msg = gsm0480_msgb_alloc_name("TS 04.80 USSD REL COMPL"); if (!msg) return NULL; -- To view, visit https://gerrit.osmocom.org/10326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I23b4b0e1c237b9b27c1db1c9a824b5329d41a38b Gerrit-Change-Number: 10326 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 15:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 15:59:17 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10328 ) Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... Patch Set 2: Code-Review+1 we can merge it as-is. However, I'd prefer if we can simply add the new function to gsm48.c. Why introduce a new file? -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 15:59:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 16:07:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 5 Aug 2018 16:07:16 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10328 ) Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... Patch Set 2: > we can merge it as-is. However, I'd prefer if we can simply add > the new function to gsm48.c. Why introduce a new file? TBH, I don't remember why I decided to introduce a new file, but now I don't see any problem of doing this in gsm48.c... Will upload the change soon. -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 16:07:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 16:24:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 5 Aug 2018 16:24:23 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10328 to look at the new patch set (#3). Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... libosmogsm: (re)introduce gsm48_push_l3hdr() There was gsm0480_l3hdr_push() declared in a header file, but not exposed in 'libosmogsm.map'. Furthermore, for some reason it was a part of GSM 04.80 API, what is not actually correct. Let's rename this symbol, and properly expose it as a part of the GSM 04.08 API. Also, let's introduce an auxiliary wrapper for messages, where the transaction identifier is required (see GSM 04.07, section 11.2.3.1.2). Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda --- M TODO-RELEASE M include/osmocom/gsm/gsm0480.h M include/osmocom/gsm/gsm48.h M src/gsm/gsm0411_utils.c M src/gsm/gsm0480.c M src/gsm/gsm48.c M src/gsm/libosmogsm.map 7 files changed, 49 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/10328/3 -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 17:41:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 17:41:49 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10328 ) Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 05 Aug 2018 17:41:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 5 17:41:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 5 Aug 2018 17:41:50 +0000 Subject: Change in libosmocore[master]: libosmogsm: (re)introduce gsm48_push_l3hdr() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10328 ) Change subject: libosmogsm: (re)introduce gsm48_push_l3hdr() ...................................................................... libosmogsm: (re)introduce gsm48_push_l3hdr() There was gsm0480_l3hdr_push() declared in a header file, but not exposed in 'libosmogsm.map'. Furthermore, for some reason it was a part of GSM 04.80 API, what is not actually correct. Let's rename this symbol, and properly expose it as a part of the GSM 04.08 API. Also, let's introduce an auxiliary wrapper for messages, where the transaction identifier is required (see GSM 04.07, section 11.2.3.1.2). Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda --- M TODO-RELEASE M include/osmocom/gsm/gsm0480.h M include/osmocom/gsm/gsm48.h M src/gsm/gsm0411_utils.c M src/gsm/gsm0480.c M src/gsm/gsm48.c M src/gsm/libosmogsm.map 7 files changed, 49 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..64833d2 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,6 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmogsm gsm0480_l3hdr_push() removed from gsm/gsm0480.h (was not exposed) +libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API) +libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr() diff --git a/include/osmocom/gsm/gsm0480.h b/include/osmocom/gsm/gsm0480.h index 246f4b3..827464e 100644 --- a/include/osmocom/gsm/gsm0480.h +++ b/include/osmocom/gsm/gsm0480.h @@ -121,6 +121,3 @@ int gsm0480_wrap_invoke(struct msgb *msg, int op, int link_id); int gsm0480_wrap_facility(struct msgb *msg); - -struct gsm48_hdr *gsm0480_l3hdr_push(struct msgb *msg, uint8_t proto_discr, - uint8_t msg_type); diff --git a/include/osmocom/gsm/gsm48.h b/include/osmocom/gsm/gsm48.h index cfae83d..2b14e6c 100644 --- a/include/osmocom/gsm/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -4,6 +4,8 @@ #include +#include + #include #include #include @@ -63,3 +65,9 @@ OSMO_DEPRECATED("Use osmo_plmn_to_bcd() instead, to not lose leading zeros in the MNC"); void gsm48_mcc_mnc_from_bcd(uint8_t *bcd_src, uint16_t *mcc, uint16_t *mnc) OSMO_DEPRECATED("Use osmo_plmn_from_bcd() instead, to not lose leading zeros in the MNC"); + +struct gsm48_hdr *gsm48_push_l3hdr(struct msgb *msg, + uint8_t pdisc, uint8_t msg_type); + +#define gsm48_push_l3hdr_tid(msg, pdisc, tid, msg_type) \ + gsm48_push_l3hdr(msg, (pdisc & 0x0f) | (tid << 4), msg_type) diff --git a/src/gsm/gsm0411_utils.c b/src/gsm/gsm0411_utils.c index 53d37a4..ccefe54 100644 --- a/src/gsm/gsm0411_utils.c +++ b/src/gsm/gsm0411_utils.c @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -354,7 +353,7 @@ uint8_t msg_type) { /* Outgoing proto_discr needs the highest bit set */ - gsm0480_l3hdr_push(msg, proto | (trans << 4), msg_type); + gsm48_push_l3hdr_tid(msg, proto, trans, msg_type); return 0; } diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index df640b8..7756ecb 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -25,6 +25,7 @@ * */ +#include #include #include @@ -863,10 +864,11 @@ msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ - gsm0480_l3hdr_push(msg, - GSM48_PDISC_NC_SS | trans_id - | (1<<7) /* TI direction = 1 */, - GSM0480_MTYPE_RELEASE_COMPLETE); + gsm48_push_l3hdr_tid(msg, GSM48_PDISC_NC_SS, + /* FIXME: TI direction is always 1 ?!? */ + trans_id | (1 << 7), + GSM0480_MTYPE_RELEASE_COMPLETE); + return msg; } @@ -932,17 +934,6 @@ return msg; } - -struct gsm48_hdr *gsm0480_l3hdr_push(struct msgb *msg, uint8_t proto_discr, - uint8_t msg_type) -{ - struct gsm48_hdr *gh; - gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); - gh->proto_discr = proto_discr; - gh->msg_type = msg_type; - return gh; -} - struct msgb *gsm0480_create_ussd_notify(int level, const char *text) { struct msgb *msg; @@ -954,7 +945,11 @@ gsm0480_wrap_invoke(msg, GSM0480_OP_CODE_USS_NOTIFY, 0); gsm0480_wrap_facility(msg); - gsm0480_l3hdr_push(msg, GSM48_PDISC_NC_SS, GSM0480_MTYPE_REGISTER); + /* And finally pre-pend the L3 header */ + gsm48_push_l3hdr(msg, GSM48_PDISC_NC_SS, + /* FIXME: no transactionID?!? */ + GSM0480_MTYPE_REGISTER); + return msg; } @@ -966,8 +961,10 @@ if (!msg) return NULL; - /* FIXME: should this set trans_id and TI direction flag? */ - gsm0480_l3hdr_push(msg, GSM48_PDISC_NC_SS, - GSM0480_MTYPE_RELEASE_COMPLETE); + /* And finally pre-pend the L3 header */ + gsm48_push_l3hdr(msg, GSM48_PDISC_NC_SS, + /* FIXME: no transactionID?!? */ + GSM0480_MTYPE_RELEASE_COMPLETE); + return msg; } diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index b4892de..136b937 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -1024,4 +1024,24 @@ { 0, NULL } }; +/*! Wrap a given \ref msg with \ref gsm48_hdr structure + * \param[out] msg A message to be wrapped + * \param[in] pdisc GSM TS 04.07 protocol discriminator 1/2, + * sub-pdisc, trans_id or skip_ind 1/2, + * see section 11.2.3.1 for details + * \param[in] msg_type GSM TS 04.08 message type + * @return pointer to pushed header within \ref msg + */ +struct gsm48_hdr *gsm48_push_l3hdr(struct msgb *msg, + uint8_t pdisc, uint8_t msg_type) +{ + struct gsm48_hdr *gh; + + gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); + gh->proto_discr = pdisc; + gh->msg_type = msg_type; + + return gh; +} + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 2bb9d97..1da398c 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -241,6 +241,7 @@ gsm414_msgt_names; +gsm48_push_l3hdr; gsm48_att_tlvdef; gsm48_cc_msg_name; gsm48_rr_msg_name; -- To view, visit https://gerrit.osmocom.org/10328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8a045efe8335d83fcbe8d43eb180972e3b1d9dda Gerrit-Change-Number: 10328 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Aug 5 20:04:06 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:04:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b6758379adfe_20605fc6849181e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 42s] #define HAVE_SYS_STAT_H 1 [ 42s] #define HAVE_STDLIB_H 1 [ 42s] #define HAVE_STRING_H 1 [ 42s] #define HAVE_MEMORY_H 1 [ 42s] #define HAVE_STRINGS_H 1 [ 42s] #define HAVE_INTTYPES_H 1 [ 42s] #define HAVE_STDINT_H 1 [ 42s] #define HAVE_UNISTD_H 1 [ 42s] #define HAVE_DLFCN_H 1 [ 42s] #define LT_OBJDIR ".libs/" [ 42s] [ 42s] configure: exit 1 [ 42s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 42s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 42s] make[1]: *** [override_dh_auto_configure] Error 255 [ 42s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 42s] debian/rules:45: recipe for target 'build' failed [ 42s] make: *** [build] Error 2 [ 42s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 42s] [ 42s] build80 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:03:51 UTC 2018. [ 42s] [ 42s] ### VM INTERACTION START ### [ 43s] Powering off. [ 43s] [ 35.654244] reboot: Power down [ 44s] ### VM INTERACTION END ### [ 44s] [ 44s] build80 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:03:54 UTC 2018. [ 44s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:04:06 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:04:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b675837df42a_20605fc6849182f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 42s] #define HAVE_SYS_STAT_H 1 [ 42s] #define HAVE_STDLIB_H 1 [ 42s] #define HAVE_STRING_H 1 [ 42s] #define HAVE_MEMORY_H 1 [ 42s] #define HAVE_STRINGS_H 1 [ 42s] #define HAVE_INTTYPES_H 1 [ 42s] #define HAVE_STDINT_H 1 [ 42s] #define HAVE_UNISTD_H 1 [ 42s] #define HAVE_DLFCN_H 1 [ 42s] #define LT_OBJDIR ".libs/" [ 42s] [ 42s] configure: exit 1 [ 42s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 42s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 42s] make[1]: *** [override_dh_auto_configure] Error 255 [ 42s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 42s] debian/rules:45: recipe for target 'build' failed [ 42s] make: *** [build] Error 2 [ 42s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 42s] [ 42s] build80 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:03:51 UTC 2018. [ 42s] [ 42s] ### VM INTERACTION START ### [ 43s] Powering off. [ 43s] [ 35.654244] reboot: Power down [ 44s] ### VM INTERACTION END ### [ 44s] [ 44s] build80 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:03:54 UTC 2018. [ 44s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:06:05 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:06:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b6758aebd68b_20605fc6849183dc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 76s] #define HAVE_STDLIB_H 1 [ 76s] #define HAVE_STRING_H 1 [ 76s] #define HAVE_MEMORY_H 1 [ 76s] #define HAVE_STRINGS_H 1 [ 76s] #define HAVE_INTTYPES_H 1 [ 76s] #define HAVE_STDINT_H 1 [ 76s] #define HAVE_UNISTD_H 1 [ 76s] #define HAVE_DLFCN_H 1 [ 76s] #define LT_OBJDIR ".libs/" [ 76s] [ 76s] configure: exit 1 [ 76s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${p[ 65.196327] serial8250: too much work for irq4 [ 76s] refix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 76s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 76s] make[1]: *** [override_dh_auto_configure] Error 255 [ 76s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 76s] debian/rules:45: recipe for target 'build' failed [ 76s] make: *** [build] Error 2 [ 76s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 76s] [ 76s] lamb01 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:48 UTC 2018. [ 76s] [ 76s] ### VM INTERACTION START ### [ 77s] Powering off. [ 77s] [ 66.451537] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] lamb01 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:50 UTC 2018. [ 77s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:06:05 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:06:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b6758af3a2c_20605fc684918478@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 76s] #define HAVE_STDLIB_H 1 [ 76s] #define HAVE_STRING_H 1 [ 76s] #define HAVE_MEMORY_H 1 [ 76s] #define HAVE_STRINGS_H 1 [ 76s] #define HAVE_INTTYPES_H 1 [ 76s] #define HAVE_STDINT_H 1 [ 76s] #define HAVE_UNISTD_H 1 [ 76s] #define HAVE_DLFCN_H 1 [ 76s] #define LT_OBJDIR ".libs/" [ 76s] [ 76s] configure: exit 1 [ 76s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${p[ 65.196327] serial8250: too much work for irq4 [ 76s] refix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 76s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 76s] make[1]: *** [override_dh_auto_configure] Error 255 [ 76s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 76s] debian/rules:45: recipe for target 'build' failed [ 76s] make: *** [build] Error 2 [ 76s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 76s] [ 76s] lamb01 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:48 UTC 2018. [ 76s] [ 76s] ### VM INTERACTION START ### [ 77s] Powering off. [ 77s] [ 66.451537] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] lamb01 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:50 UTC 2018. [ 77s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:06:05 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:06:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b6758af5a459_20605fc684918573@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 88s] #define HAVE_SYS_STAT_H 1 [ 88s] #define HAVE_STDLIB_H 1 [ 88s] #define HAVE_STRING_H 1 [ 88s] #define HAVE_MEMORY_H 1 [ 88s] #define HAVE_STRINGS_H 1 [ 88s] #define HAVE_INTTYPES_H 1 [ 88s] #define HAVE_STDINT_H 1 [ 88s] #define HAVE_UNISTD_H 1 [ 88s] #define HAVE_DLFCN_H 1 [ 88s] #define LT_OBJDIR ".libs/" [ 88s] [ 88s] configure: exit 1 [ 88s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 88s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 88s] make[1]: *** [override_dh_auto_configure] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 88s] debian/rules:45: recipe for target 'build' failed [ 88s] make: *** [build] Error 2 [ 88s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 88s] [ 88s] wildcard2 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:53 UTC 2018. [ 88s] [ 88s] ### VM INTERACTION START ### [ 91s] [ 76.588916] sysrq: SysRq : Power Off [ 91s] [ 76.593237] reboot: Power down [ 92s] ### VM INTERACTION END ### [ 92s] [ 92s] wildcard2 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:57 UTC 2018. [ 92s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:06:05 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:06:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b6758af9f12b_20605fc68491866b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 88s] #define HAVE_SYS_STAT_H 1 [ 88s] #define HAVE_STDLIB_H 1 [ 88s] #define HAVE_STRING_H 1 [ 88s] #define HAVE_MEMORY_H 1 [ 88s] #define HAVE_STRINGS_H 1 [ 88s] #define HAVE_INTTYPES_H 1 [ 88s] #define HAVE_STDINT_H 1 [ 88s] #define HAVE_UNISTD_H 1 [ 88s] #define HAVE_DLFCN_H 1 [ 88s] #define LT_OBJDIR ".libs/" [ 88s] [ 88s] configure: exit 1 [ 88s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 88s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 88s] make[1]: *** [override_dh_auto_configure] Error 2 [ 88s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 88s] debian/rules:45: recipe for target 'build' failed [ 88s] make: *** [build] Error 2 [ 88s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 88s] [ 88s] wildcard2 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:53 UTC 2018. [ 88s] [ 88s] ### VM INTERACTION START ### [ 91s] [ 76.588916] sysrq: SysRq : Power Off [ 91s] [ 76.593237] reboot: Power down [ 92s] ### VM INTERACTION END ### [ 92s] [ 92s] wildcard2 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:05:57 UTC 2018. [ 92s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:09:30 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:09:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b6759833afa9_20605fc6849190d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 78s] #define HAVE_SYS_STAT_H 1 [ 78s] #define HAVE_STDLIB_H 1 [ 78s] #define HAVE_STRING_H 1 [ 78s] #define HAVE_MEMORY_H 1 [ 78s] #define HAVE_STRINGS_H 1 [ 78s] #define HAVE_INTTYPES_H 1 [ 78s] #define HAVE_STDINT_H 1 [ 78s] #define HAVE_UNISTD_H 1 [ 78s] #define HAVE_DLFCN_H 1 [ 78s] #define LT_OBJDIR ".libs/" [ 78s] [ 78s] configure: exit 1 [ 78s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 78s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 78s] make[1]: *** [override_dh_auto_configure] Error 2 [ 78s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 78s] debian/rules:45: recipe for target 'build' failed [ 78s] make: *** [build] Error 2 [ 78s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 78s] [ 78s] lamb10 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:09:23 UTC 2018. [ 78s] [ 78s] ### VM INTERACTION START ### [ 81s] [ 69.827476] sysrq: SysRq : Power Off [ 81s] [ 69.835085] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb10 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:09:27 UTC 2018. [ 81s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:09:30 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:09:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b675982cf33f_20605fc68491896d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 78s] #define HAVE_SYS_STAT_H 1 [ 78s] #define HAVE_STDLIB_H 1 [ 78s] #define HAVE_STRING_H 1 [ 78s] #define HAVE_MEMORY_H 1 [ 78s] #define HAVE_STRINGS_H 1 [ 78s] #define HAVE_INTTYPES_H 1 [ 78s] #define HAVE_STDINT_H 1 [ 78s] #define HAVE_UNISTD_H 1 [ 78s] #define HAVE_DLFCN_H 1 [ 78s] #define LT_OBJDIR ".libs/" [ 78s] [ 78s] configure: exit 1 [ 78s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 78s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 78s] make[1]: *** [override_dh_auto_configure] Error 2 [ 78s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 78s] debian/rules:45: recipe for target 'build' failed [ 78s] make: *** [build] Error 2 [ 78s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 78s] [ 78s] lamb10 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:09:23 UTC 2018. [ 78s] [ 78s] ### VM INTERACTION START ### [ 81s] [ 69.827476] sysrq: SysRq : Power Off [ 81s] [ 69.835085] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb10 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:09:27 UTC 2018. [ 81s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:10:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:10:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b6759a2565da_20605fc6849191fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 66s] #define HAVE_SYS_STAT_H 1 [ 66s] #define HAVE_STDLIB_H 1 [ 66s] #define HAVE_STRING_H 1 [ 66s] #define HAVE_MEMORY_H 1 [ 66s] #define HAVE_STRINGS_H 1 [ 66s] #define HAVE_INTTYPES_H 1 [ 66s] #define HAVE_STDINT_H 1 [ 66s] #define HAVE_UNISTD_H 1 [ 66s] #define HAVE_DLFCN_H 1 [ 66s] #define LT_OBJDIR ".libs/" [ 66s] [ 66s] configure: exit 1 [ 66s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 66s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 66s] make[1]: *** [override_dh_auto_configure] Error 255 [ 66s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 66s] debian/rules:45: recipe for target 'build' failed [ 66s] make: *** [build] Error 2 [ 66s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 66s] [ 66s] sheep83 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:09:57 UTC 2018. [ 66s] [ 66s] ### VM INTERACTION START ### [ 69s] [ 62.875359] sysrq: SysRq : Power Off [ 69s] [ 62.881407] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] sheep83 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:10:00 UTC 2018. [ 69s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:10:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:10:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b6759a2b76ff_20605fc68491926b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 66s] #define HAVE_SYS_STAT_H 1 [ 66s] #define HAVE_STDLIB_H 1 [ 66s] #define HAVE_STRING_H 1 [ 66s] #define HAVE_MEMORY_H 1 [ 66s] #define HAVE_STRINGS_H 1 [ 66s] #define HAVE_INTTYPES_H 1 [ 66s] #define HAVE_STDINT_H 1 [ 66s] #define HAVE_UNISTD_H 1 [ 66s] #define HAVE_DLFCN_H 1 [ 66s] #define LT_OBJDIR ".libs/" [ 66s] [ 66s] configure: exit 1 [ 66s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 66s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 66s] make[1]: *** [override_dh_auto_configure] Error 255 [ 66s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 66s] debian/rules:45: recipe for target 'build' failed [ 66s] make: *** [build] Error 2 [ 66s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 66s] [ 66s] sheep83 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:09:57 UTC 2018. [ 66s] [ 66s] ### VM INTERACTION START ### [ 69s] [ 62.875359] sysrq: SysRq : Power Off [ 69s] [ 62.881407] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] sheep83 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:10:00 UTC 2018. [ 69s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:10:41 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:10:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b6759daa3c5e_20605fc6849193f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 79s] #define HAVE_SYS_STAT_H 1 [ 79s] #define HAVE_STDLIB_H 1 [ 79s] #define HAVE_STRING_H 1 [ 79s] #define HAVE_MEMORY_H 1 [ 79s] #define HAVE_STRINGS_H 1 [ 79s] #define HAVE_INTTYPES_H 1 [ 79s] #define HAVE_STDINT_H 1 [ 79s] #define HAVE_UNISTD_H 1 [ 79s] #define HAVE_DLFCN_H 1 [ 79s] #define LT_OBJDIR ".libs/" [ 79s] [ 79s] configure: exit 1 [ 79s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 79s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 79s] make[1]: *** [override_dh_auto_configure] Error 2 [ 79s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 79s] debian/rules:45: recipe for target 'build' failed [ 79s] make: *** [build] Error 2 [ 79s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 79s] [ 79s] lamb55 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:10:20 UTC 2018. [ 79s] [ 79s] ### VM INTERACTION START ### [ 82s] [ 72.357990] sysrq: SysRq : Power Off [ 82s] [ 72.365523] reboot: Power down [ 82s] ### VM INTERACTION END ### [ 82s] [ 82s] lamb55 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:10:24 UTC 2018. [ 82s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:10:41 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:10:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b6759dae040a_20605fc6849194a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 79s] #define HAVE_SYS_STAT_H 1 [ 79s] #define HAVE_STDLIB_H 1 [ 79s] #define HAVE_STRING_H 1 [ 79s] #define HAVE_MEMORY_H 1 [ 79s] #define HAVE_STRINGS_H 1 [ 79s] #define HAVE_INTTYPES_H 1 [ 79s] #define HAVE_STDINT_H 1 [ 79s] #define HAVE_UNISTD_H 1 [ 79s] #define HAVE_DLFCN_H 1 [ 79s] #define LT_OBJDIR ".libs/" [ 79s] [ 79s] configure: exit 1 [ 79s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 79s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 79s] make[1]: *** [override_dh_auto_configure] Error 2 [ 79s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 79s] debian/rules:45: recipe for target 'build' failed [ 79s] make: *** [build] Error 2 [ 79s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 79s] [ 79s] lamb55 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:10:20 UTC 2018. [ 79s] [ 79s] ### VM INTERACTION START ### [ 82s] [ 72.357990] sysrq: SysRq : Power Off [ 82s] [ 72.365523] reboot: Power down [ 82s] ### VM INTERACTION END ### [ 82s] [ 82s] lamb55 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:10:24 UTC 2018. [ 82s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:14:09 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:14:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b675aae11c88_20605fc68492015b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 76s] #define HAVE_SYS_STAT_H 1 [ 76s] #define HAVE_STDLIB_H 1 [ 76s] #define HAVE_STRING_H 1 [ 76s] #define HAVE_MEMORY_H 1 [ 76s] #define HAVE_STRINGS_H 1 [ 76s] #define HAVE_INTTYPES_H 1 [ 76s] #define HAVE_STDINT_H 1 [ 76s] #define HAVE_UNISTD_H 1 [ 76s] #define HAVE_DLFCN_H 1 [ 76s] #define LT_OBJDIR ".libs/" [ 76s] [ 76s] configure: exit 1 [ 76s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 76s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 76s] make[1]: *** [override_dh_auto_configure] Error 2 [ 76s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 76s] debian/rules:45: recipe for target 'build' failed [ 76s] make: *** [build] Error 2 [ 76s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 76s] [ 76s] lamb28 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:14:02 UTC 2018. [ 76s] [ 76s] ### VM INTERACTION START ### [ 79s] [ 67.696321] sysrq: SysRq : Power Off [ 79s] [ 67.703475] reboot: Power down [ 80s] ### VM INTERACTION END ### [ 80s] [ 80s] lamb28 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:14:06 UTC 2018. [ 80s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:15:14 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:15:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b675aeb3853f_20605fc6849203cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 83s] #define HAVE_SYS_STAT_H 1 [ 83s] #define HAVE_STDLIB_H 1 [ 83s] #define HAVE_STRING_H 1 [ 83s] #define HAVE_MEMORY_H 1 [ 83s] #define HAVE_STRINGS_H 1 [ 83s] #define HAVE_INTTYPES_H 1 [ 83s] #define HAVE_STDINT_H 1 [ 83s] #define HAVE_UNISTD_H 1 [ 83s] #define HAVE_DLFCN_H 1 [ 83s] #define LT_OBJDIR ".libs/" [ 83s] [ 83s] configure: exit 1 [ 83s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 83s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 83s] make[1]: *** [override_dh_auto_configure] Error 255 [ 83s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 83s] debian/rules:45: recipe for target 'build' failed [ 83s] make: *** [build] Error 2 [ 83s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 83s] [ 83s] lamb10 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:14:57 UTC 2018. [ 83s] [ 83s] ### VM INTERACTION START ### [ 86s] [ 76.182547] sysrq: SysRq : Power Off [ 86s] [ 76.190407] reboot: Power down [ 86s] ### VM INTERACTION END ### [ 86s] [ 86s] lamb10 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:15:01 UTC 2018. [ 86s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:15:17 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:15:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b675aeb89259_20605fc684920432@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 84s] #define HAVE_SYS_STAT_H 1 [ 84s] #define HAVE_STDLIB_H 1 [ 84s] #define HAVE_STRING_H 1 [ 84s] #define HAVE_MEMORY_H 1 [ 84s] #define HAVE_STRINGS_H 1 [ 84s] #define HAVE_INTTYPES_H 1 [ 84s] #define HAVE_STDINT_H 1 [ 84s] #define HAVE_UNISTD_H 1 [ 84s] #define HAVE_DLFCN_H 1 [ 84s] #define LT_OBJDIR ".libs/" [ 84s] [ 84s] configure: exit 1 [ 84s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 84s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 84s] make[1]: *** [override_dh_auto_configure] Error 2 [ 84s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 84s] debian/rules:45: recipe for target 'build' failed [ 84s] make: *** [build] Error 2 [ 84s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 84s] [ 84s] wildcard3 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:15:08 UTC 2018. [ 84s] [ 84s] ### VM INTERACTION START ### [ 87s] [ 69.161370] sysrq: SysRq : Power Off [ 87s] [ 69.164347] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] wildcard3 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:15:15 UTC 2018. [ 89s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:16:05 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:16:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b675b2324897_20605fc684920518@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 131s] #define HAVE_SYS_STAT_H 1 [ 131s] #define HAVE_STDLIB_H 1 [ 131s] #define HAVE_STRING_H 1 [ 131s] #define HAVE_MEMORY_H 1 [ 131s] #define HAVE_STRINGS_H 1 [ 131s] #define HAVE_INTTYPES_H 1 [ 131s] #define HAVE_STDINT_H 1 [ 131s] #define HAVE_UNISTD_H 1 [ 131s] #define HAVE_DLFCN_H 1 [ 131s] #define LT_OBJDIR ".libs/" [ 131s] [ 131s] configure: exit 1 [ 131s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 131s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 131s] make[1]: *** [override_dh_auto_configure] Error 2 [ 131s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 131s] debian/rules:45: recipe for target 'build' failed [ 131s] make: *** [build] Error 2 [ 131s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 131s] [ 131s] cloud131 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:15:51 UTC 2018. [ 131s] [ 131s] ### VM INTERACTION START ### [ 134s] [ 109.094745] sysrq: SysRq : Power Off [ 134s] [ 109.106584] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] cloud131 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:15:56 UTC 2018. [ 135s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 5 20:43:13 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 05 Aug 2018 20:43:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b6761786f120_20605fc6849217a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 122s] #define HAVE_SYS_STAT_H 1 [ 122s] #define HAVE_STDLIB_H 1 [ 122s] #define HAVE_STRING_H 1 [ 122s] #define HAVE_MEMORY_H 1 [ 122s] #define HAVE_STRINGS_H 1 [ 122s] #define HAVE_INTTYPES_H 1 [ 122s] #define HAVE_STDINT_H 1 [ 122s] #define HAVE_UNISTD_H 1 [ 122s] #define HAVE_DLFCN_H 1 [ 122s] #define LT_OBJDIR ".libs/" [ 122s] [ 122s] configure: exit 1 [ 122s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 122s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 122s] make[1]: *** [override_dh_auto_configure] Error 2 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 122s] debian/rules:45: recipe for target 'build' failed [ 122s] make: *** [build] Error 2 [ 122s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 122s] [ 122s] armbuild01 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:43:05 UTC 2018. [ 122s] [ 122s] ### VM INTERACTION START ### [ 125s] [ 101.022371] SysRq : Power Off [ 125s] [ 101.032667] reboot: Power down [ 125s] ### VM INTERACTION END ### [ 125s] [ 125s] armbuild01 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Sun Aug 5 20:43:09 UTC 2018. [ 125s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Aug 5 21:21:55 2018 From: gerrit-no-reply at lists.osmocom.org (Jan Hrach) Date: Sun, 5 Aug 2018 21:21:55 +0000 Subject: Change in osmo-tetra[master]: allow dumping GSMTAP to PCAP file In-Reply-To: References: Message-ID: Jan Hrach has posted comments on this change. ( https://gerrit.osmocom.org/10265 ) Change subject: allow dumping GSMTAP to PCAP file ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10265/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10265/1//COMMIT_MSG at 10 PS1, Line 10: lost > did you try increasing the socket buffer size of both the sender side (in osmo-tetra) as well as the [?] The problem was that when I ran "tshark -e something" and then tetra-rx on the same file several times, some frames were randomly missing between runs. However, now it seems that the problem was actually OS#3410. So now I think I'm fine with picking up the traffic on loopback instead of reading pcap from file and if you don't want this feature, feel free to reject this change. -- To view, visit https://gerrit.osmocom.org/10265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I955589a1d576f180fc4b80dba8ed8dc364e43d8b Gerrit-Change-Number: 10265 Gerrit-PatchSet: 1 Gerrit-Owner: Jan Hrach Gerrit-Reviewer: Jan Hrach Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 05 Aug 2018 21:21:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Aug 6 00:02:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 6 Aug 2018 00:02:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo, sup?= =?UTF-8?Q?erfemto=5Fv3.0.1pre,default,osmocom-master-debian9_#992?= Message-ID: <1329156020.89.1533513774704.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 66.70 KB...] Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rsl.lo CC gsm_utils.lo CC rxlev_stat.lo CC comp128v23.lo CC tlv_parser.lo CC gsm48.lo CC comp128.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC milenage/aes-encblock.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_tables.lo CC gsm0503_mapping.lo CC gsm0503_interleaving.lo CC gsm0503_coding.lo CC gsm0503_parity.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_ns.lo CC gprs_bssgp.lo CC gprs_ns_frgre.lo CC gprs_bssgp_bss.lo CC gprs_ns_vty.lo CC common_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp_util.lo CCLD libosmogb.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la ' libtool: warning: relinking 'libosmogb.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) libtool: install: /usr/bin/install -c .libs/libosmogb.so.6.1.0T libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so.6 || { rm -f libosmogb.so.6 && ln -s libosmogb.so.6.1.0 libosmogb.so.6; }; }) libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so || { rm -f libosmogb.so && ln -s libosmogb.so.6.1.0 libosmogb.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogb.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/ctrl make[2]: Entering directory ' CC control_cmd.lo CC control_if.lo CC fsm_ctrl_commands.lo CC control_vty.lo CCLD libosmoctrl.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la ' libtool: warning: relinking 'libosmoctrl.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -I../../include -I../../include -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmoctrl.map -version-info 3:0:3 -no-undefined -o libosmoctrl.la -rpath control_cmd.lo control_if.lo fsm_ctrl_commands.lo control_vty.lo -ltalloc ../../src/libosmocore.la ../../src/gsm/libosmogsm.la ../../src/vty/libosmovty.la ) libtool: install: /usr/bin/install -c .libs/libosmoctrl.so.0.3.0T libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so.0 || { rm -f libosmoctrl.so.0 && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so.0; }; }) libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so || { rm -f libosmoctrl.so && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoctrl.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/sim make[2]: Entering directory ' CC core.lo CC reader.lo CC reader_pcsc.lo CC class_tables.lo CC card_fs_isim.lo CC card_fs_usim.lo CC card_fs_sim.lo CC card_fs_uicc.lo /bin/bash: line 2: 2745 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT core.lo -MD -MP -MF $depbase.Tpo -c -o core.lo core.c /bin/bash: line 2: 2747 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT reader_pcsc.lo -MD -MP -MF $depbase.Tpo -c -o reader_pcsc.lo reader_pcsc.c Makefile:490: recipe for target 'core.lo' failed make[2]: *** [core.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... Makefile:490: recipe for target 'reader_pcsc.lo' failed make[2]: *** [reader_pcsc.lo] Error 139 make[2]: Leaving directory ' Makefile:604: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Aug 6 00:51:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 6 Aug 2018 00:51:00 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sysmo?= =?UTF-8?Q?,superfemto=5Fv3.0.1pre,default,osmocom-master-debian9_#993?= In-Reply-To: <1329156020.89.1533513774704.JavaMail.jenkins@jenkins.osmocom.org> References: <1329156020.89.1533513774704.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <895339507.90.1533516660014.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:06:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:06:26 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10343 Change subject: osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly At the "autorecon -fi" stage, Osmocom programs either need the .git directory peresent, or a .tarball-version file in order to determine the exact source code version. Normally, "make dist" exists exactly for this purpose: It runs git-version-gen and saves the result to .tarball-version, and we then include this file in the .tar.gz we generate. However, as the nightly paackaging scripts use git-buildpackage, it bypasses the "make dist" logic and hence we need to 1) manually generate the .tarball-version file 2) copy it over to the directory specified as --git-export-dir This way, the .tarball-version is inside the tar.xz generated by gbp, and autoreconf then has something to use as PACKAGE_VERSION. This commit fixes "UNKNOWN-dirty" in .pc files of libraries, as well as in "show version" commands on the vty. Closes: OS#3449 Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/10343/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index b616a8f..320e376 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -42,8 +42,8 @@ local version local date - # git version - version=$(test -x ./git-version-gen && ./git-version-gen . 2>/dev/null) + # determine git version *and generate the .tarball-version file* + version=$(test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null) # debian doesn't allow '-' in version. version=$(echo "$version" | sed 's/-/./g' ) @@ -88,7 +88,8 @@ mkdir -p "$DATA/$name" # source code build without dependency checks and unsigned source and unsigned change log - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" $gitbpargs + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' $gitbpargs mv "$DATA/$name/"*.tar* "$DATA/$name/"*.dsc "$oscdir/" -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:09:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:09:53 +0000 Subject: Change in libosmocore[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10344 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: Ibeb6d273e2d26f37a36cbde4a948ce95395491f8 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/10344/1 diff --git a/debian/rules b/debian/rules index 6eb7346..a9d961c 100755 --- a/debian/rules +++ b/debian/rules @@ -25,10 +25,6 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-static -- To view, visit https://gerrit.osmocom.org/10344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeb6d273e2d26f37a36cbde4a948ce95395491f8 Gerrit-Change-Number: 10344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:11:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:11:15 +0000 Subject: Change in libosmo-abis[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10345 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I4ce87d474687b61bc2104a02015e954425736123 Related: OS#3449 --- M debian/rules 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/45/10345/1 diff --git a/debian/rules b/debian/rules index 10ba659..f59ca1e 100755 --- a/debian/rules +++ b/debian/rules @@ -14,13 +14,9 @@ override_dh_strip: dh_strip --dbg-package=libosmo-abis-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_clean: dh_clean - rm -f tests/package.m4 tests/testsuite .version .tarball-version + rm -f tests/package.m4 tests/testsuite .version override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/10345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4ce87d474687b61bc2104a02015e954425736123 Gerrit-Change-Number: 10345 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:12:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:12:02 +0000 Subject: Change in libosmo-netif[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10346 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I8915ebbf7d3a64a9474e1aeb49b1d192a388ef53 Related: OS#3449 --- M debian/rules 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/46/10346/1 diff --git a/debian/rules b/debian/rules index f0e00c5..4472bd1 100755 --- a/debian/rules +++ b/debian/rules @@ -15,17 +15,13 @@ override_dh_strip: dh_strip --dbg-package=libosmo-netif-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_install: sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` dh_install override_dh_clean: dh_clean - rm -f tests/package.m4 tests/testsuite .version .tarball-version + rm -f tests/package.m4 tests/testsuite .version override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/10346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8915ebbf7d3a64a9474e1aeb49b1d192a388ef53 Gerrit-Change-Number: 10346 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:12:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:12:50 +0000 Subject: Change in libosmo-sccp[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10347 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I620c96eb311be6fdd4187bdcc311ea893ad93614 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/47/10347/1 diff --git a/debian/rules b/debian/rules index 279568f..bea0a76 100755 --- a/debian/rules +++ b/debian/rules @@ -23,10 +23,6 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-static -- To view, visit https://gerrit.osmocom.org/10347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I620c96eb311be6fdd4187bdcc311ea893ad93614 Gerrit-Change-Number: 10347 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:14:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:14:36 +0000 Subject: Change in osmo-bts[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10348 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: Idde432ffd3dae3b7beac77c794e60b6ba555e488 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/10348/1 diff --git a/debian/rules b/debian/rules index 32d9342..dcc8a11 100755 --- a/debian/rules +++ b/debian/rules @@ -15,10 +15,6 @@ dh_strip --package=osmo-bts-virtual --dbg-package=osmo-bts-virtual-dbg dh_strip --package=osmo-bts-trx --dbg-package=osmo-bts-trx-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-trx -- To view, visit https://gerrit.osmocom.org/10348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idde432ffd3dae3b7beac77c794e60b6ba555e488 Gerrit-Change-Number: 10348 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:15:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:15:19 +0000 Subject: Change in osmo-ggsn[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10349 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I1466936033c2f60edd1078eb41f3508d87da4402 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/49/10349/1 diff --git a/debian/rules b/debian/rules index bcf1931..5db7886 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,3 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg dh_strip -plibgtp3 --dbg-package=libgtp-dbg - -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf -- To view, visit https://gerrit.osmocom.org/10349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1466936033c2f60edd1078eb41f3508d87da4402 Gerrit-Change-Number: 10349 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:16:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:16:21 +0000 Subject: Change in osmo-iuh[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10350 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I08fa724a9a70e024845f683fb3f5d245a0bd9aa3 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/50/10350/1 diff --git a/debian/rules b/debian/rules index 3e2c91f..9ebfdd0 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,6 @@ %: dh $@ --with autoreconf -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: dh_strip --dbg-package=libosmo-ranap-dbg -- To view, visit https://gerrit.osmocom.org/10350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I08fa724a9a70e024845f683fb3f5d245a0bd9aa3 Gerrit-Change-Number: 10350 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:17:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:17:10 +0000 Subject: Change in osmo-mgw[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10351 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I4bf7b6124c747a0cff5562187a099c33525e109e Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/51/10351/1 diff --git a/debian/rules b/debian/rules index ae85e13..d13e426 100755 --- a/debian/rules +++ b/debian/rules @@ -29,8 +29,4 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg -- To view, visit https://gerrit.osmocom.org/10351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4bf7b6124c747a0cff5562187a099c33525e109e Gerrit-Change-Number: 10351 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:18:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:18:36 +0000 Subject: Change in osmo-pcu[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10352 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I093c9c1943e5f09d8f91f94af438f697a93e7127 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/52/10352/1 diff --git a/debian/rules b/debian/rules index 63ee1c3..cffb6ca 100755 --- a/debian/rules +++ b/debian/rules @@ -14,10 +14,6 @@ override_dh_strip: dh_strip --dbg-package=osmo-pcu-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_clean: dh_clean $(RM) tests/package.m4 -- To view, visit https://gerrit.osmocom.org/10352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I093c9c1943e5f09d8f91f94af438f697a93e7127 Gerrit-Change-Number: 10352 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:18:40 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 6 Aug 2018 09:18:40 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/10343 ) Change subject: osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... Patch Set 1: Code-Review-1 (2 comments) This seems to break the get_commit_version() function which will never return the git version, but only the one from debian/changelog https://gerrit.osmocom.org/#/c/10343/1/scripts/osmocom-nightly-packages.sh File scripts/osmocom-nightly-packages.sh: https://gerrit.osmocom.org/#/c/10343/1/scripts/osmocom-nightly-packages.sh at 46 PS1, Line 46: version=$(test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null) $version is now empty since > redirects the output.:w Maybe add a version=$(cat .tarball-version) here? https://gerrit.osmocom.org/#/c/10343/1/scripts/osmocom-nightly-packages.sh at 51 PS1, Line 51: if [ -z "$version" ] ; then So this will always be true. -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 06 Aug 2018 09:18:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:19:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:19:27 +0000 Subject: Change in osmo-sip-connector[master]: debian/rules: Don't overwrite .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10353 Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: Ia277b1d41c3f5b81a2c909320d23c2e763feac28 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/53/10353/1 diff --git a/debian/rules b/debian/rules index 48f53f5..5e9e20f 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,3 @@ override_dh_strip: dh_strip --dbg-package=osmo-sip-connector-dbg - -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf -- To view, visit https://gerrit.osmocom.org/10353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia277b1d41c3f5b81a2c909320d23c2e763feac28 Gerrit-Change-Number: 10353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:22:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:22:04 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly In-Reply-To: References: Message-ID: Hello daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10343 to look at the new patch set (#2). Change subject: osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... osmocom-nightly-packages: Ensure PACKAGE_VERSION is set correctly At the "autorecon -fi" stage, Osmocom programs either need the .git directory peresent, or a .tarball-version file in order to determine the exact source code version. Normally, "make dist" exists exactly for this purpose: It runs git-version-gen and saves the result to .tarball-version, and we then include this file in the .tar.gz we generate. However, as the nightly paackaging scripts use git-buildpackage, it bypasses the "make dist" logic and hence we need to 1) manually generate the .tarball-version file 2) copy it over to the directory specified as --git-export-dir This way, the .tarball-version is inside the tar.xz generated by gbp, and autoreconf then has something to use as PACKAGE_VERSION. This commit fixes "UNKNOWN-dirty" in .pc files of libraries, as well as in "show version" commands on the vty. Closes: OS#3449 Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/10343/2 -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:22:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:22:35 +0000 Subject: Change in libosmocore[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10344 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeb6d273e2d26f37a36cbde4a948ce95395491f8 Gerrit-Change-Number: 10344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:22:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:22:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:22:48 +0000 Subject: Change in osmo-bts[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10348 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idde432ffd3dae3b7beac77c794e60b6ba555e488 Gerrit-Change-Number: 10348 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:22:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:23:06 +0000 Subject: Change in osmo-sip-connector[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10353 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia277b1d41c3f5b81a2c909320d23c2e763feac28 Gerrit-Change-Number: 10353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:23:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:23:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:23:31 +0000 Subject: Change in osmo-ggsn[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10349 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1466936033c2f60edd1078eb41f3508d87da4402 Gerrit-Change-Number: 10349 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:23:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:24:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:24:07 +0000 Subject: Change in libosmo-sccp[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10347 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I620c96eb311be6fdd4187bdcc311ea893ad93614 Gerrit-Change-Number: 10347 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:24:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:24:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:24:14 +0000 Subject: Change in libosmo-netif[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10346 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8915ebbf7d3a64a9474e1aeb49b1d192a388ef53 Gerrit-Change-Number: 10346 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:24:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:24:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:24:23 +0000 Subject: Change in libosmo-abis[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10345 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ce87d474687b61bc2104a02015e954425736123 Gerrit-Change-Number: 10345 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:24:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:25:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:25:05 +0000 Subject: Change in osmo-iuh[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10350 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08fa724a9a70e024845f683fb3f5d245a0bd9aa3 Gerrit-Change-Number: 10350 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:25:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:25:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:25:22 +0000 Subject: Change in osmo-pcu[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10352 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I093c9c1943e5f09d8f91f94af438f697a93e7127 Gerrit-Change-Number: 10352 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 09:25:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 09:30:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 09:30:15 +0000 Subject: Change in libosmocore[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10344 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: Ibeb6d273e2d26f37a36cbde4a948ce95395491f8 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 6eb7346..a9d961c 100755 --- a/debian/rules +++ b/debian/rules @@ -25,10 +25,6 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-static -- To view, visit https://gerrit.osmocom.org/10344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibeb6d273e2d26f37a36cbde4a948ce95395491f8 Gerrit-Change-Number: 10344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:00:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:00:49 +0000 Subject: Change in osmo-ci[master]: osmocom packages: Ensure PACKAGE_VERSION is set correctly In-Reply-To: References: Message-ID: Hello daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10343 to look at the new patch set (#3). Change subject: osmocom packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... osmocom packages: Ensure PACKAGE_VERSION is set correctly At the "autorecon -fi" stage, Osmocom programs either need the .git directory peresent, or a .tarball-version file in order to determine the exact source code version. Normally, "make dist" exists exactly for this purpose: It runs git-version-gen and saves the result to .tarball-version, and we then include this file in the .tar.gz we generate. However, as the nightly paackaging scripts use git-buildpackage, it bypasses the "make dist" logic and hence we need to 1) manually generate the .tarball-version file 2) copy it over to the directory specified as --git-export-dir This way, the .tarball-version is inside the tar.xz generated by gbp, and autoreconf then has something to use as PACKAGE_VERSION. This commit fixes "UNKNOWN-dirty" in .pc files of libraries, as well as in "show version" commands on the vty. Closes: OS#3449 Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/10343/3 -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:06:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:06:53 +0000 Subject: Change in osmo-pcu[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10352 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I093c9c1943e5f09d8f91f94af438f697a93e7127 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/rules b/debian/rules index 63ee1c3..cffb6ca 100755 --- a/debian/rules +++ b/debian/rules @@ -14,10 +14,6 @@ override_dh_strip: dh_strip --dbg-package=osmo-pcu-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_clean: dh_clean $(RM) tests/package.m4 -- To view, visit https://gerrit.osmocom.org/10352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I093c9c1943e5f09d8f91f94af438f697a93e7127 Gerrit-Change-Number: 10352 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:06:55 +0000 Subject: Change in libosmo-abis[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10345 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I4ce87d474687b61bc2104a02015e954425736123 Related: OS#3449 --- M debian/rules 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/rules b/debian/rules index 10ba659..f59ca1e 100755 --- a/debian/rules +++ b/debian/rules @@ -14,13 +14,9 @@ override_dh_strip: dh_strip --dbg-package=libosmo-abis-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_clean: dh_clean - rm -f tests/package.m4 tests/testsuite .version .tarball-version + rm -f tests/package.m4 tests/testsuite .version override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/10345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4ce87d474687b61bc2104a02015e954425736123 Gerrit-Change-Number: 10345 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:06:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:06:58 +0000 Subject: Change in libosmo-netif[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10346 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I8915ebbf7d3a64a9474e1aeb49b1d192a388ef53 Related: OS#3449 --- M debian/rules 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index f0e00c5..4472bd1 100755 --- a/debian/rules +++ b/debian/rules @@ -15,17 +15,13 @@ override_dh_strip: dh_strip --dbg-package=libosmo-netif-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_install: sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` dh_install override_dh_clean: dh_clean - rm -f tests/package.m4 tests/testsuite .version .tarball-version + rm -f tests/package.m4 tests/testsuite .version override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -- To view, visit https://gerrit.osmocom.org/10346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8915ebbf7d3a64a9474e1aeb49b1d192a388ef53 Gerrit-Change-Number: 10346 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:07:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:07:00 +0000 Subject: Change in libosmo-sccp[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10347 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I620c96eb311be6fdd4187bdcc311ea893ad93614 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 279568f..bea0a76 100755 --- a/debian/rules +++ b/debian/rules @@ -23,10 +23,6 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-static -- To view, visit https://gerrit.osmocom.org/10347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I620c96eb311be6fdd4187bdcc311ea893ad93614 Gerrit-Change-Number: 10347 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:07:03 +0000 Subject: Change in osmo-ggsn[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10349 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I1466936033c2f60edd1078eb41f3508d87da4402 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index bcf1931..5db7886 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,3 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg dh_strip -plibgtp3 --dbg-package=libgtp-dbg - -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf -- To view, visit https://gerrit.osmocom.org/10349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1466936033c2f60edd1078eb41f3508d87da4402 Gerrit-Change-Number: 10349 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:07:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:07:05 +0000 Subject: Change in osmo-sip-connector[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10353 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: Ia277b1d41c3f5b81a2c909320d23c2e763feac28 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 48f53f5..5e9e20f 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,3 @@ override_dh_strip: dh_strip --dbg-package=osmo-sip-connector-dbg - -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf -- To view, visit https://gerrit.osmocom.org/10353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia277b1d41c3f5b81a2c909320d23c2e763feac28 Gerrit-Change-Number: 10353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:07:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:07:07 +0000 Subject: Change in osmo-bts[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10348 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: Idde432ffd3dae3b7beac77c794e60b6ba555e488 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/rules b/debian/rules index 32d9342..dcc8a11 100755 --- a/debian/rules +++ b/debian/rules @@ -15,10 +15,6 @@ dh_strip --package=osmo-bts-virtual --dbg-package=osmo-bts-virtual-dbg dh_strip --package=osmo-bts-trx --dbg-package=osmo-bts-trx-dbg -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - override_dh_auto_configure: dh_auto_configure -- --enable-trx -- To view, visit https://gerrit.osmocom.org/10348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idde432ffd3dae3b7beac77c794e60b6ba555e488 Gerrit-Change-Number: 10348 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:07:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 10:07:17 +0000 Subject: Change in osmo-iuh[master]: debian/rules: Don't overwrite .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10350 ) Change subject: debian/rules: Don't overwrite .tarball-version ...................................................................... debian/rules: Don't overwrite .tarball-version The .tarball-version file should contain the *source version* uniquely identifying the git commit, and not the Debian package name. With https://gerrit.osmocom.org/#/c/osmo-ci/+/10343/ there is a correct .tarball-version file in the .tar.xz of the nightly source packages. Change-Id: I08fa724a9a70e024845f683fb3f5d245a0bd9aa3 Related: OS#3449 --- M debian/rules 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/rules b/debian/rules index 3e2c91f..9ebfdd0 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,6 @@ %: dh $@ --with autoreconf -override_dh_autoreconf: - echo $(VERSION) > .tarball-version - dh_autoreconf - # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: dh_strip --dbg-package=libosmo-ranap-dbg -- To view, visit https://gerrit.osmocom.org/10350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08fa724a9a70e024845f683fb3f5d245a0bd9aa3 Gerrit-Change-Number: 10350 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 10:13:24 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 6 Aug 2018 10:13:24 +0000 Subject: Change in osmo-ci[master]: osmocom packages: Ensure PACKAGE_VERSION is set correctly In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/10343 ) Change subject: osmocom packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 06 Aug 2018 10:13:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 11:32:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 11:32:19 +0000 Subject: Change in osmo-ci[master]: osmocom packages: Ensure PACKAGE_VERSION is set correctly In-Reply-To: References: Message-ID: Hello daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10343 to look at the new patch set (#4). Change subject: osmocom packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... osmocom packages: Ensure PACKAGE_VERSION is set correctly At the "autorecon -fi" stage, Osmocom programs either need the .git directory peresent, or a .tarball-version file in order to determine the exact source code version. Normally, "make dist" exists exactly for this purpose: It runs git-version-gen and saves the result to .tarball-version, and we then include this file in the .tar.gz we generate. However, as the nightly paackaging scripts use git-buildpackage, it bypasses the "make dist" logic and hence we need to 1) manually generate the .tarball-version file 2) copy it over to the directory specified as --git-export-dir This way, the .tarball-version is inside the tar.xz generated by gbp, and autoreconf then has something to use as PACKAGE_VERSION. This commit fixes "UNKNOWN-dirty" in .pc files of libraries, as well as in "show version" commands on the vty. Closes: OS#3449 Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/43/10343/4 -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 11:32:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 11:32:20 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Add .tar.xz for new packages Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10354 Change subject: osmocom-latest-packages: Add .tar.xz for new packages ...................................................................... osmocom-latest-packages: Add .tar.xz for new packages If a new package is uploaded to OBS, prior to this change, only the .dsc file is uploaded, not the actual .tar.xz containing the source code. Let's fix that. Change-Id: Id1c9e6d112781004238a516b24dd446af0beb95a --- M scripts/osmocom-latest-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/10354/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 3d4f340..1d122aa 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -43,6 +43,7 @@ # creating a new package is different from using old ones mkdir "$TOP/$PROJ/$1" mv "$output/"*.dsc "$TOP/$PROJ/$1/" + mv "$output/"*.tar* "$TOP/$PROJ/$1/" cd "$TOP/$PROJ" osc add "$1" else -- To view, visit https://gerrit.osmocom.org/10354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id1c9e6d112781004238a516b24dd446af0beb95a Gerrit-Change-Number: 10354 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 11:41:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 11:41:07 +0000 Subject: Change in osmo-ci[master]: osmocom packages: Ensure PACKAGE_VERSION is set correctly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10343 ) Change subject: osmocom packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... Patch Set 4: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 06 Aug 2018 11:41:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 11:41:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 11:41:16 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Add .tar.xz for new packages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10354 ) Change subject: osmocom-latest-packages: Add .tar.xz for new packages ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id1c9e6d112781004238a516b24dd446af0beb95a Gerrit-Change-Number: 10354 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 06 Aug 2018 11:41:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 11:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 11:41:29 +0000 Subject: Change in osmo-ci[master]: osmocom packages: Ensure PACKAGE_VERSION is set correctly In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10343 ) Change subject: osmocom packages: Ensure PACKAGE_VERSION is set correctly ...................................................................... osmocom packages: Ensure PACKAGE_VERSION is set correctly At the "autorecon -fi" stage, Osmocom programs either need the .git directory peresent, or a .tarball-version file in order to determine the exact source code version. Normally, "make dist" exists exactly for this purpose: It runs git-version-gen and saves the result to .tarball-version, and we then include this file in the .tar.gz we generate. However, as the nightly paackaging scripts use git-buildpackage, it bypasses the "make dist" logic and hence we need to 1) manually generate the .tarball-version file 2) copy it over to the directory specified as --git-export-dir This way, the .tarball-version is inside the tar.xz generated by gbp, and autoreconf then has something to use as PACKAGE_VERSION. This commit fixes "UNKNOWN-dirty" in .pc files of libraries, as well as in "show version" commands on the vty. Closes: OS#3449 Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 --- M scripts/osmocom-latest-packages.sh M scripts/osmocom-nightly-packages.sh 2 files changed, 11 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index e8d61a3..3d4f340 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -34,7 +34,10 @@ git fetch VER=$(git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1) git checkout -f -B "$VER" "refs/tags/$VER" - gbp buildpackage -d -S -uc -us "--git-export-dir=$output" "--git-debian-branch=$VER" + test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null + gbp buildpackage -d -S -uc -us "--git-export-dir=$output" "--git-debian-branch=$VER" \ + --git-ignore-new \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' if [ ! -d "$TOP/$PROJ/$1" ] ; then # creating a new package is different from using old ones diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index b616a8f..0d1ce0f 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -42,8 +42,9 @@ local version local date - # git version - version=$(test -x ./git-version-gen && ./git-version-gen . 2>/dev/null) + # determine git version *and generate the .tarball-version file* + test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null + version=$(cat .tarball-version) # debian doesn't allow '-' in version. version=$(echo "$version" | sed 's/-/./g' ) @@ -88,7 +89,10 @@ mkdir -p "$DATA/$name" # source code build without dependency checks and unsigned source and unsigned change log - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" $gitbpargs + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-ignore-new \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' \ + $gitbpargs mv "$DATA/$name/"*.tar* "$DATA/$name/"*.dsc "$oscdir/" -- To view, visit https://gerrit.osmocom.org/10343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I76e3713f0b01a6110091ff90e8e53aa79533c374 Gerrit-Change-Number: 10343 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 11:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 11:41:29 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Add .tar.xz for new packages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10354 ) Change subject: osmocom-latest-packages: Add .tar.xz for new packages ...................................................................... osmocom-latest-packages: Add .tar.xz for new packages If a new package is uploaded to OBS, prior to this change, only the .dsc file is uploaded, not the actual .tar.xz containing the source code. Let's fix that. Change-Id: Id1c9e6d112781004238a516b24dd446af0beb95a --- M scripts/osmocom-latest-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 3d4f340..1d122aa 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -43,6 +43,7 @@ # creating a new package is different from using old ones mkdir "$TOP/$PROJ/$1" mv "$output/"*.dsc "$TOP/$PROJ/$1/" + mv "$output/"*.tar* "$TOP/$PROJ/$1/" cd "$TOP/$PROJ" osc add "$1" else -- To view, visit https://gerrit.osmocom.org/10354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id1c9e6d112781004238a516b24dd446af0beb95a Gerrit-Change-Number: 10354 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:18:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:18:50 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Fix build of limesuite Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10355 Change subject: osmocom-nightly-packages: Fix build of limesuite ...................................................................... osmocom-nightly-packages: Fix build of limesuite We add a bogus .tarball-version file to make limesuite look like osmocom projects. Change-Id: Idbe34df54743d346cf4194d6ea377e886132042d --- M scripts/osmocom-nightly-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/10355/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 0d1ce0f..068c3fa 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -128,6 +128,7 @@ git clone https://github.com/myriadrf/LimeSuite limesuite cd limesuite git checkout "$TAG" + touch .tarball-version } build_osmocom() { -- To view, visit https://gerrit.osmocom.org/10355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idbe34df54743d346cf4194d6ea377e886132042d Gerrit-Change-Number: 10355 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:20:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:20:05 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Fix build of limesuite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10355 ) Change subject: osmocom-nightly-packages: Fix build of limesuite ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbe34df54743d346cf4194d6ea377e886132042d Gerrit-Change-Number: 10355 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 06 Aug 2018 12:20:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:20:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:20:07 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Fix build of limesuite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10355 ) Change subject: osmocom-nightly-packages: Fix build of limesuite ...................................................................... osmocom-nightly-packages: Fix build of limesuite We add a bogus .tarball-version file to make limesuite look like osmocom projects. Change-Id: Idbe34df54743d346cf4194d6ea377e886132042d --- M scripts/osmocom-nightly-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 0d1ce0f..068c3fa 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -128,6 +128,7 @@ git clone https://github.com/myriadrf/LimeSuite limesuite cd limesuite git checkout "$TAG" + touch .tarball-version } build_osmocom() { -- To view, visit https://gerrit.osmocom.org/10355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idbe34df54743d346cf4194d6ea377e886132042d Gerrit-Change-Number: 10355 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:21:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:21:03 +0000 Subject: Change in osmo-tetra[master]: allow dumping GSMTAP to PCAP file In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/10265 ) Change subject: allow dumping GSMTAP to PCAP file ...................................................................... Abandoned as indicated by Jan, this was actually OS#3410 (uninitialized memory). -- To view, visit https://gerrit.osmocom.org/10265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I955589a1d576f180fc4b80dba8ed8dc364e43d8b Gerrit-Change-Number: 10265 Gerrit-PatchSet: 1 Gerrit-Owner: Jan Hrach Gerrit-Reviewer: Jan Hrach Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:21:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:21:11 +0000 Subject: Change in osmo-tetra[master]: phy/tetra_burst.c: use bitwise operations to speed up synchronization In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10263 ) Change subject: phy/tetra_burst.c: use bitwise operations to speed up synchronization ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b90cc70c2ec67253a0fd2f00c6957a80971c38b Gerrit-Change-Number: 10263 Gerrit-PatchSet: 1 Gerrit-Owner: Jan Hrach Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 12:21:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:21:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:21:19 +0000 Subject: Change in osmo-tetra[master]: phy/tetra_burst.c: use bitwise operations to speed up synchronization In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10263 ) Change subject: phy/tetra_burst.c: use bitwise operations to speed up synchronization ...................................................................... phy/tetra_burst.c: use bitwise operations to speed up synchronization Finding synchronization sequence eats several times more CPU time than the actual decoding. This is especially pronounced on channels with lots of errors (where synchronization is lost frequently) and channels that are most of the time empty (such as uplink channels, support for which is coming in following patches). Profiling shows that all the time is spent in memcmp calls. A complicated and efficient algorithm, e.g. Aho-Corasick, turned out to be not necessary. Compilers can optimize even a simple bit filter into fast code. This provides only a modest (~25 %) performance gain, more fixes are coming. Fixes: OS#1897 Change-Id: I3b90cc70c2ec67253a0fd2f00c6957a80971c38b --- M src/phy/tetra_burst.c 1 file changed, 30 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/phy/tetra_burst.c b/src/phy/tetra_burst.c index 62efb72..5bede06 100644 --- a/src/phy/tetra_burst.c +++ b/src/phy/tetra_burst.c @@ -269,9 +269,39 @@ int tetra_find_train_seq(const uint8_t *in, unsigned int end_of_in, uint32_t mask_of_train_seq, unsigned int *offset) { + static uint32_t tsq_bytes[5]; + + if (tsq_bytes[0] == 0) { +#define FILTER_LOOKAHEAD_LEN 22 +#define FILTER_LOOKAHEAD_MASK ((1< Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:23:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:23:40 +0000 Subject: Change in osmo-hlr[master]: gitignore: Add .tarball-version Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10356 Change subject: gitignore: Add .tarball-version ...................................................................... gitignore: Add .tarball-version Change-Id: I2ed792ef248e2b62f63acc7d83add240df03336f --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/56/10356/1 diff --git a/.gitignore b/.gitignore index 0fd74be..cba941d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.pyc .*.sw? .version +.tarball-version Makefile Makefile.in aclocal.m4 -- To view, visit https://gerrit.osmocom.org/10356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2ed792ef248e2b62f63acc7d83add240df03336f Gerrit-Change-Number: 10356 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:24:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:24:05 +0000 Subject: Change in osmo-hlr[master]: gitignore: Add .tarball-version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10356 ) Change subject: gitignore: Add .tarball-version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2ed792ef248e2b62f63acc7d83add240df03336f Gerrit-Change-Number: 10356 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 12:24:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 12:25:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 12:25:25 +0000 Subject: Change in osmo-hlr[master]: gitignore: Add .tarball-version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10356 ) Change subject: gitignore: Add .tarball-version ...................................................................... gitignore: Add .tarball-version Change-Id: I2ed792ef248e2b62f63acc7d83add240df03336f --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 0fd74be..cba941d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.pyc .*.sw? .version +.tarball-version Makefile Makefile.in aclocal.m4 -- To view, visit https://gerrit.osmocom.org/10356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2ed792ef248e2b62f63acc7d83add240df03336f Gerrit-Change-Number: 10356 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 6 13:18:54 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:18:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b684ac991fbc_20605fc6841120359@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 162s] #define HAVE_STDLIB_H 1 [ 162s] #define HAVE_STRING_H 1 [ 162s] #define HAVE_MEMORY_H 1 [ 162s] #define HAVE_STRINGS_H 1 [ 162s] #define HAVE_INTTYPES_H 1 [ 162s] #define HAVE_STDINT_H 1 [ 162s] #define HAVE_UNISTD_H 1 [ 162s] #define HAVE_DLFCN_H 1 [ 162s] #define LT_OBJDIR ".libs/" [ 162s] [ 162s] configure: exit 1 [ 162s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 162s] debian/rules:51: recipe for target 'override_dh_auto_confi[ 113.838942] serial8250: too much work for irq4 [ 162s] gure' failed [ 162s] make[1]: *** [override_dh_auto_configure] Error 255 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] debian/rules:45: recipe for target 'build' failed [ 162s] make: *** [build] Error 2 [ 162s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 162s] [ 162s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:18:31 UTC 2018. [ 162s] [ 162s] ### VM INTERACTION START ### [ 163s] Powering off. [ 163s] [ 114.997337] reboot: Power down [ 169s] ### VM INTERACTION END ### [ 169s] [ 169s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:18:39 UTC 2018. [ 169s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:18:54 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:18:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b684ac9d7425_20605fc684112045e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 162s] #define HAVE_STDLIB_H 1 [ 162s] #define HAVE_STRING_H 1 [ 162s] #define HAVE_MEMORY_H 1 [ 162s] #define HAVE_STRINGS_H 1 [ 162s] #define HAVE_INTTYPES_H 1 [ 162s] #define HAVE_STDINT_H 1 [ 162s] #define HAVE_UNISTD_H 1 [ 162s] #define HAVE_DLFCN_H 1 [ 162s] #define LT_OBJDIR ".libs/" [ 162s] [ 162s] configure: exit 1 [ 162s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 162s] debian/rules:51: recipe for target 'override_dh_auto_confi[ 113.838942] serial8250: too much work for irq4 [ 162s] gure' failed [ 162s] make[1]: *** [override_dh_auto_configure] Error 255 [ 162s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 162s] debian/rules:45: recipe for target 'build' failed [ 162s] make: *** [build] Error 2 [ 162s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 162s] [ 162s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:18:31 UTC 2018. [ 162s] [ 162s] ### VM INTERACTION START ### [ 163s] Powering off. [ 163s] [ 114.997337] reboot: Power down [ 169s] ### VM INTERACTION END ### [ 169s] [ 169s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:18:39 UTC 2018. [ 169s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:20:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:20:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b684b0570f06_20605fc68411209c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 134s] #define HAVE_SYS_STAT_H 1 [ 134s] #define HAVE_STDLIB_H 1 [ 134s] #define HAVE_STRING_H 1 [ 134s] #define HAVE_MEMORY_H 1 [ 134s] #define HAVE_STRINGS_H 1 [ 134s] #define HAVE_INTTYPES_H 1 [ 134s] #define HAVE_STDINT_H 1 [ 134s] #define HAVE_UNISTD_H 1 [ 134s] #define HAVE_DLFCN_H 1 [ 134s] #define LT_OBJDIR ".libs/" [ 134s] [ 134s] configure: exit 1 [ 134s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 134s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 134s] make[1]: *** [override_dh_auto_configure] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] debian/rules:45: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] armbuild23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:19:44 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 136s] [ 123.338864] SysRq : Power Off [ 136s] [ 123.339997] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] armbuild23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:19:47 UTC 2018. [ 136s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:20:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:20:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b684b05c80ae_20605fc6841121095@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 134s] #define HAVE_SYS_STAT_H 1 [ 134s] #define HAVE_STDLIB_H 1 [ 134s] #define HAVE_STRING_H 1 [ 134s] #define HAVE_MEMORY_H 1 [ 134s] #define HAVE_STRINGS_H 1 [ 134s] #define HAVE_INTTYPES_H 1 [ 134s] #define HAVE_STDINT_H 1 [ 134s] #define HAVE_UNISTD_H 1 [ 134s] #define HAVE_DLFCN_H 1 [ 134s] #define LT_OBJDIR ".libs/" [ 134s] [ 134s] configure: exit 1 [ 134s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 134s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 134s] make[1]: *** [override_dh_auto_configure] Error 2 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] debian/rules:45: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] armbuild23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:19:44 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 136s] [ 123.338864] SysRq : Power Off [ 136s] [ 123.339997] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] armbuild23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:19:47 UTC 2018. [ 136s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:27:08 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:27:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b684cc386551_20605fc684112411b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 78s] #define HAVE_SYS_STAT_H 1 [ 78s] #define HAVE_STDLIB_H 1 [ 78s] #define HAVE_STRING_H 1 [ 78s] #define HAVE_MEMORY_H 1 [ 78s] #define HAVE_STRINGS_H 1 [ 78s] #define HAVE_INTTYPES_H 1 [ 78s] #define HAVE_STDINT_H 1 [ 78s] #define HAVE_UNISTD_H 1 [ 78s] #define HAVE_DLFCN_H 1 [ 78s] #define LT_OBJDIR ".libs/" [ 78s] [ 78s] configure: exit 1 [ 78s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 78s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 78s] make[1]: *** [override_dh_auto_configure] Error 2 [ 78s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 78s] debian/rules:45: recipe for target 'build' failed [ 78s] make: *** [build] Error 2 [ 78s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 78s] [ 78s] lamb02 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:26:52 UTC 2018. [ 78s] [ 78s] ### VM INTERACTION START ### [ 81s] [ 69.318025] sysrq: SysRq : Power Off [ 81s] [ 69.323312] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb02 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:26:56 UTC 2018. [ 81s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:27:08 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:27:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b684cc3c5137_20605fc68411242b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 78s] #define HAVE_SYS_STAT_H 1 [ 78s] #define HAVE_STDLIB_H 1 [ 78s] #define HAVE_STRING_H 1 [ 78s] #define HAVE_MEMORY_H 1 [ 78s] #define HAVE_STRINGS_H 1 [ 78s] #define HAVE_INTTYPES_H 1 [ 78s] #define HAVE_STDINT_H 1 [ 78s] #define HAVE_UNISTD_H 1 [ 78s] #define HAVE_DLFCN_H 1 [ 78s] #define LT_OBJDIR ".libs/" [ 78s] [ 78s] configure: exit 1 [ 78s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 78s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 78s] make[1]: *** [override_dh_auto_configure] Error 2 [ 78s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 78s] debian/rules:45: recipe for target 'build' failed [ 78s] make: *** [build] Error 2 [ 78s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 78s] [ 78s] lamb02 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:26:52 UTC 2018. [ 78s] [ 78s] ### VM INTERACTION START ### [ 81s] [ 69.318025] sysrq: SysRq : Power Off [ 81s] [ 69.323312] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb02 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:26:56 UTC 2018. [ 81s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:27:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:27:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b684cc69eb77_20605fc684112463f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 170s] #define HAVE_SYS_STAT_H 1 [ 170s] #define HAVE_STDLIB_H 1 [ 170s] #define HAVE_STRING_H 1 [ 170s] #define HAVE_MEMORY_H 1 [ 170s] #define HAVE_STRINGS_H 1 [ 170s] #define HAVE_INTTYPES_H 1 [ 170s] #define HAVE_STDINT_H 1 [ 170s] #define HAVE_UNISTD_H 1 [ 170s] #define HAVE_DLFCN_H 1 [ 170s] #define LT_OBJDIR ".libs/" [ 170s] [ 170s] configure: exit 1 [ 170s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 170s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 170s] make[1]: *** [override_dh_auto_configure] Error 255 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 170s] debian/rules:45: recipe for target 'build' failed [ 170s] make: *** [build] Error 2 [ 170s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 170s] [ 170s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:11 UTC 2018. [ 170s] [ 170s] ### VM INTERACTION START ### [ 171s] Powering off. [ 171s] [ 127.996242] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:15 UTC 2018. [ 173s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:27:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:27:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b684cc6e71a7_20605fc68411247ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 170s] #define HAVE_SYS_STAT_H 1 [ 170s] #define HAVE_STDLIB_H 1 [ 170s] #define HAVE_STRING_H 1 [ 170s] #define HAVE_MEMORY_H 1 [ 170s] #define HAVE_STRINGS_H 1 [ 170s] #define HAVE_INTTYPES_H 1 [ 170s] #define HAVE_STDINT_H 1 [ 170s] #define HAVE_UNISTD_H 1 [ 170s] #define HAVE_DLFCN_H 1 [ 170s] #define LT_OBJDIR ".libs/" [ 170s] [ 170s] configure: exit 1 [ 170s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 170s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 170s] make[1]: *** [override_dh_auto_configure] Error 255 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 170s] debian/rules:45: recipe for target 'build' failed [ 170s] make: *** [build] Error 2 [ 170s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 170s] [ 170s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:11 UTC 2018. [ 170s] [ 170s] ### VM INTERACTION START ### [ 171s] Powering off. [ 171s] [ 127.996242] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] cloud116 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:15 UTC 2018. [ 173s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:28:00 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:28:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b684ce45018d_20605fc6841125112@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 123s] #define HAVE_SYS_STAT_H 1 [ 123s] #define HAVE_STDLIB_H 1 [ 123s] #define HAVE_STRING_H 1 [ 123s] #define HAVE_MEMORY_H 1 [ 123s] #define HAVE_STRINGS_H 1 [ 123s] #define HAVE_INTTYPES_H 1 [ 123s] #define HAVE_STDINT_H 1 [ 123s] #define HAVE_UNISTD_H 1 [ 123s] #define HAVE_DLFCN_H 1 [ 123s] #define LT_OBJDIR ".libs/" [ 123s] [ 123s] configure: exit 1 [ 123s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 123s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 123s] make[1]: *** [override_dh_auto_configure] Error 255 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] debian/rules:45: recipe for target 'build' failed [ 123s] make: *** [build] Error 2 [ 123s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 123s] [ 123s] cloud115 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:49 UTC 2018. [ 123s] [ 123s] ### VM INTERACTION START ### [ 126s] [ 104.427603] sysrq: SysRq : Power Off [ 126s] [ 104.441812] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] cloud115 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:55 UTC 2018. [ 129s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:28:00 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:28:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b684ce577b1_20605fc6841125358@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 123s] #define HAVE_SYS_STAT_H 1 [ 123s] #define HAVE_STDLIB_H 1 [ 123s] #define HAVE_STRING_H 1 [ 123s] #define HAVE_MEMORY_H 1 [ 123s] #define HAVE_STRINGS_H 1 [ 123s] #define HAVE_INTTYPES_H 1 [ 123s] #define HAVE_STDINT_H 1 [ 123s] #define HAVE_UNISTD_H 1 [ 123s] #define HAVE_DLFCN_H 1 [ 123s] #define LT_OBJDIR ".libs/" [ 123s] [ 123s] configure: exit 1 [ 123s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 123s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 123s] make[1]: *** [override_dh_auto_configure] Error 255 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] debian/rules:45: recipe for target 'build' failed [ 123s] make: *** [build] Error 2 [ 123s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 123s] [ 123s] cloud115 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:49 UTC 2018. [ 123s] [ 123s] ### VM INTERACTION START ### [ 126s] [ 104.427603] sysrq: SysRq : Power Off [ 126s] [ 104.441812] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] cloud115 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:27:55 UTC 2018. [ 129s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:29:42 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:29:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b684d5a2ca2f_20605fc6841126174@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 89s] #define HAVE_SYS_STAT_H 1 [ 89s] #define HAVE_STDLIB_H 1 [ 89s] #define HAVE_STRING_H 1 [ 89s] #define HAVE_MEMORY_H 1 [ 89s] #define HAVE_STRINGS_H 1 [ 89s] #define HAVE_INTTYPES_H 1 [ 89s] #define HAVE_STDINT_H 1 [ 89s] #define HAVE_UNISTD_H 1 [ 89s] #define HAVE_DLFCN_H 1 [ 89s] #define LT_OBJDIR ".libs/" [ 89s] [ 89s] configure: exit 1 [ 89s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 89s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 89s] make[1]: *** [override_dh_auto_configure] Error 2 [ 89s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 89s] debian/rules:45: recipe for target 'build' failed [ 89s] make: *** [build] Error 2 [ 89s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 89s] [ 89s] lamb28 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:29:33 UTC 2018. [ 89s] [ 89s] ### VM INTERACTION START ### [ 92s] [ 78.765611] sysrq: SysRq : Power Off [ 92s] [ 78.771704] reboot: Power down [ 92s] ### VM INTERACTION END ### [ 92s] [ 92s] lamb28 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:29:38 UTC 2018. [ 92s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:29:42 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:29:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b684d5ab89f1_20605fc684112626b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 89s] #define HAVE_SYS_STAT_H 1 [ 89s] #define HAVE_STDLIB_H 1 [ 89s] #define HAVE_STRING_H 1 [ 89s] #define HAVE_MEMORY_H 1 [ 89s] #define HAVE_STRINGS_H 1 [ 89s] #define HAVE_INTTYPES_H 1 [ 89s] #define HAVE_STDINT_H 1 [ 89s] #define HAVE_UNISTD_H 1 [ 89s] #define HAVE_DLFCN_H 1 [ 89s] #define LT_OBJDIR ".libs/" [ 89s] [ 89s] configure: exit 1 [ 89s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 89s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 89s] make[1]: *** [override_dh_auto_configure] Error 2 [ 89s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 89s] debian/rules:45: recipe for target 'build' failed [ 89s] make: *** [build] Error 2 [ 89s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 89s] [ 89s] lamb28 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:29:33 UTC 2018. [ 89s] [ 89s] ### VM INTERACTION START ### [ 92s] [ 78.765611] sysrq: SysRq : Power Off [ 92s] [ 78.771704] reboot: Power down [ 92s] ### VM INTERACTION END ### [ 92s] [ 92s] lamb28 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:29:38 UTC 2018. [ 92s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:30:17 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:30:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b684d76d6d40_20605fc6841126554@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 113s] #define HAVE_SYS_STAT_H 1 [ 113s] #define HAVE_STDLIB_H 1 [ 113s] #define HAVE_STRING_H 1 [ 113s] #define HAVE_MEMORY_H 1 [ 113s] #define HAVE_STRINGS_H 1 [ 113s] #define HAVE_INTTYPES_H 1 [ 113s] #define HAVE_STDINT_H 1 [ 113s] #define HAVE_UNISTD_H 1 [ 113s] #define HAVE_DLFCN_H 1 [ 113s] #define LT_OBJDIR ".libs/" [ 113s] [ 113s] configure: exit 1 [ 113s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 113s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 113s] make[1]: *** [override_dh_auto_configure] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s] debian/rules:45: recipe for target 'build' failed [ 113s] make: *** [build] Error 2 [ 113s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 113s] [ 113s] lamb24 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:29:57 UTC 2018. [ 113s] [ 113s] ### VM INTERACTION START ### [ 117s] [ 104.037573] sysrq: SysRq : Power Off [ 117s] [ 104.042233] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] lamb24 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:30:01 UTC 2018. [ 117s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:30:17 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:30:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b684d7739c24_20605fc6841126633@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 113s] #define HAVE_SYS_STAT_H 1 [ 113s] #define HAVE_STDLIB_H 1 [ 113s] #define HAVE_STRING_H 1 [ 113s] #define HAVE_MEMORY_H 1 [ 113s] #define HAVE_STRINGS_H 1 [ 113s] #define HAVE_INTTYPES_H 1 [ 113s] #define HAVE_STDINT_H 1 [ 113s] #define HAVE_UNISTD_H 1 [ 113s] #define HAVE_DLFCN_H 1 [ 113s] #define LT_OBJDIR ".libs/" [ 113s] [ 113s] configure: exit 1 [ 113s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/i386-linux-gnu --libexecdir=\${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 113s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 113s] make[1]: *** [override_dh_auto_configure] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s] debian/rules:45: recipe for target 'build' failed [ 113s] make: *** [build] Error 2 [ 113s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 113s] [ 113s] lamb24 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:29:57 UTC 2018. [ 113s] [ 113s] ### VM INTERACTION START ### [ 117s] [ 104.037573] sysrq: SysRq : Power Off [ 117s] [ 104.042233] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] lamb24 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:30:01 UTC 2018. [ 117s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:35:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:35:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b684ea5dbac6_20605fc684113189e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 86s] #define HAVE_SYS_STAT_H 1 [ 86s] #define HAVE_STDLIB_H 1 [ 86s] #define HAVE_STRING_H 1 [ 86s] #define HAVE_MEMORY_H 1 [ 86s] #define HAVE_STRINGS_H 1 [ 86s] #define HAVE_INTTYPES_H 1 [ 86s] #define HAVE_STDINT_H 1 [ 86s] #define HAVE_UNISTD_H 1 [ 86s] #define HAVE_DLFCN_H 1 [ 86s] #define LT_OBJDIR ".libs/" [ 86s] [ 86s] configure: exit 1 [ 86s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 86s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 86s] make[1]: *** [override_dh_auto_configure] Error 255 [ 86s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 86s] debian/rules:45: recipe for target 'build' failed [ 86s] make: *** [build] Error 2 [ 86s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 86s] [ 86s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:05 UTC 2018. [ 86s] [ 86s] ### VM INTERACTION START ### [ 89s] [ 77.177494] sysrq: SysRq : Power Off [ 89s] [ 77.182090] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:09 UTC 2018. [ 89s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:35:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:35:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b684ea66fcf5_20605fc68411319d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 86s] #define HAVE_SYS_STAT_H 1 [ 86s] #define HAVE_STDLIB_H 1 [ 86s] #define HAVE_STRING_H 1 [ 86s] #define HAVE_MEMORY_H 1 [ 86s] #define HAVE_STRINGS_H 1 [ 86s] #define HAVE_INTTYPES_H 1 [ 86s] #define HAVE_STDINT_H 1 [ 86s] #define HAVE_UNISTD_H 1 [ 86s] #define HAVE_DLFCN_H 1 [ 86s] #define LT_OBJDIR ".libs/" [ 86s] [ 86s] configure: exit 1 [ 86s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 86s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 86s] make[1]: *** [override_dh_auto_configure] Error 255 [ 86s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 86s] debian/rules:45: recipe for target 'build' failed [ 86s] make: *** [build] Error 2 [ 86s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 86s] [ 86s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:05 UTC 2018. [ 86s] [ 86s] ### VM INTERACTION START ### [ 89s] [ 77.177494] sysrq: SysRq : Power Off [ 89s] [ 77.182090] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:09 UTC 2018. [ 89s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:35:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:35:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b684ea7877c_20605fc684113209e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 97s] #define HAVE_SYS_STAT_H 1 [ 97s] #define HAVE_STDLIB_H 1 [ 97s] #define HAVE_STRING_H 1 [ 97s] #define HAVE_MEMORY_H 1 [ 97s] #define HAVE_STRINGS_H 1 [ 97s] #define HAVE_INTTYPES_H 1 [ 97s] #define HAVE_STDINT_H 1 [ 97s] #define HAVE_UNISTD_H 1 [ 97s] #define HAVE_DLFCN_H 1 [ 97s] #define LT_OBJDIR ".libs/" [ 97s] [ 97s] configure: exit 1 [ 97s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 97s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 97s] make[1]: *** [override_dh_auto_configure] Error 2 [ 97s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 97s] debian/rules:45: recipe for target 'build' failed [ 97s] make: *** [build] Error 2 [ 97s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 97s] [ 97s] lamb13 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:11 UTC 2018. [ 97s] [ 97s] ### VM INTERACTION START ### [ 100s] [ 89.780182] sysrq: SysRq : Power Off [ 100s] [ 89.785526] reboot: Power down [ 100s] ### VM INTERACTION END ### [ 100s] [ 100s] lamb13 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:14 UTC 2018. [ 100s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:35:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:35:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b684ea759e1b_20605fc68411321d9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 97s] #define HAVE_SYS_STAT_H 1 [ 97s] #define HAVE_STDLIB_H 1 [ 97s] #define HAVE_STRING_H 1 [ 97s] #define HAVE_MEMORY_H 1 [ 97s] #define HAVE_STRINGS_H 1 [ 97s] #define HAVE_INTTYPES_H 1 [ 97s] #define HAVE_STDINT_H 1 [ 97s] #define HAVE_UNISTD_H 1 [ 97s] #define HAVE_DLFCN_H 1 [ 97s] #define LT_OBJDIR ".libs/" [ 97s] [ 97s] configure: exit 1 [ 97s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 97s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 97s] make[1]: *** [override_dh_auto_configure] Error 2 [ 97s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 97s] debian/rules:45: recipe for target 'build' failed [ 97s] make: *** [build] Error 2 [ 97s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 97s] [ 97s] lamb13 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:11 UTC 2018. [ 97s] [ 97s] ### VM INTERACTION START ### [ 100s] [ 89.780182] sysrq: SysRq : Power Off [ 100s] [ 89.785526] reboot: Power down [ 100s] ### VM INTERACTION END ### [ 100s] [ 100s] lamb13 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:35:14 UTC 2018. [ 100s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:39:13 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:39:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b684f995a038_20605fc68411348ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 74s] #define HAVE_SYS_STAT_H 1 [ 74s] #define HAVE_STDLIB_H 1 [ 74s] #define HAVE_STRING_H 1 [ 74s] #define HAVE_MEMORY_H 1 [ 74s] #define HAVE_STRINGS_H 1 [ 74s] #define HAVE_INTTYPES_H 1 [ 74s] #define HAVE_STDINT_H 1 [ 74s] #define HAVE_UNISTD_H 1 [ 74s] #define HAVE_DLFCN_H 1 [ 74s] #define LT_OBJDIR ".libs/" [ 74s] [ 74s] configure: exit 1 [ 74s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 74s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 74s] make[1]: *** [override_dh_auto_configure] Error 2 [ 74s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 74s] debian/rules:45: recipe for target 'build' failed [ 74s] make: *** [build] Error 2 [ 74s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 74s] [ 74s] lamb23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:38:57 UTC 2018. [ 74s] [ 74s] ### VM INTERACTION START ### [ 77s] [ 65.032810] sysrq: SysRq : Power Off [ 77s] [ 65.043402] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] lamb23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:39:01 UTC 2018. [ 77s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:39:13 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:39:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b684f99a3569_20605fc6841134945@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 74s] #define HAVE_SYS_STAT_H 1 [ 74s] #define HAVE_STDLIB_H 1 [ 74s] #define HAVE_STRING_H 1 [ 74s] #define HAVE_MEMORY_H 1 [ 74s] #define HAVE_STRINGS_H 1 [ 74s] #define HAVE_INTTYPES_H 1 [ 74s] #define HAVE_STDINT_H 1 [ 74s] #define HAVE_UNISTD_H 1 [ 74s] #define HAVE_DLFCN_H 1 [ 74s] #define LT_OBJDIR ".libs/" [ 74s] [ 74s] configure: exit 1 [ 74s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 74s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 74s] make[1]: *** [override_dh_auto_configure] Error 2 [ 74s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 74s] debian/rules:45: recipe for target 'build' failed [ 74s] make: *** [build] Error 2 [ 74s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 74s] [ 74s] lamb23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:38:57 UTC 2018. [ 74s] [ 74s] ### VM INTERACTION START ### [ 77s] [ 65.032810] sysrq: SysRq : Power Off [ 77s] [ 65.043402] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] lamb23 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:39:01 UTC 2018. [ 77s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:40:08 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:40:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b684fb923bab_20605fc6841135985@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 123s] #define HAVE_SYS_STAT_H 1 [ 123s] #define HAVE_STDLIB_H 1 [ 123s] #define HAVE_STRING_H 1 [ 123s] #define HAVE_MEMORY_H 1 [ 123s] #define HAVE_STRINGS_H 1 [ 123s] #define HAVE_INTTYPES_H 1 [ 123s] #define HAVE_STDINT_H 1 [ 123s] #define HAVE_UNISTD_H 1 [ 123s] #define HAVE_DLFCN_H 1 [ 123s] #define LT_OBJDIR ".libs/" [ 123s] [ 123s] configure: exit 1 [ 123s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 123s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 123s] make[1]: *** [override_dh_auto_configure] Error 2 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] debian/rules:45: recipe for target 'build' failed [ 123s] make: *** [build] Error 2 [ 123s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 123s] [ 123s] lamb26 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:39:50 UTC 2018. [ 123s] [ 123s] ### VM INTERACTION START ### [ 126s] [ 111.700653] sysrq: SysRq : Power Off [ 126s] [ 111.710580] reboot: Power down [ 126s] ### VM INTERACTION END ### [ 126s] [ 126s] lamb26 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:39:53 UTC 2018. [ 126s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 13:40:08 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 13:40:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b684fb985480_20605fc684113604d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 123s] #define HAVE_SYS_STAT_H 1 [ 123s] #define HAVE_STDLIB_H 1 [ 123s] #define HAVE_STRING_H 1 [ 123s] #define HAVE_MEMORY_H 1 [ 123s] #define HAVE_STRINGS_H 1 [ 123s] #define HAVE_INTTYPES_H 1 [ 123s] #define HAVE_STDINT_H 1 [ 123s] #define HAVE_UNISTD_H 1 [ 123s] #define HAVE_DLFCN_H 1 [ 123s] #define LT_OBJDIR ".libs/" [ 123s] [ 123s] configure: exit 1 [ 123s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --enable-iu --enable-smpp returned exit code 1 [ 123s] debian/rules:51: recipe for target 'override_dh_auto_configure' failed [ 123s] make[1]: *** [override_dh_auto_configure] Error 2 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] debian/rules:45: recipe for target 'build' failed [ 123s] make: *** [build] Error 2 [ 123s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 123s] [ 123s] lamb26 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:39:50 UTC 2018. [ 123s] [ 123s] ### VM INTERACTION START ### [ 126s] [ 111.700653] sysrq: SysRq : Power Off [ 126s] [ 111.710580] reboot: Power down [ 126s] ### VM INTERACTION END ### [ 126s] [ 126s] lamb26 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 13:39:53 UTC 2018. [ 126s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 6 13:59:33 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 6 Aug 2018 13:59:33 +0000 Subject: Change in simtrace2[master]: jenkins: add build uploads Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10357 Change subject: jenkins: add build uploads ...................................................................... jenkins: add build uploads firmware binaries should be uploaded to https://ftp.osmocom.org/binaries/simtrace2/firmware/ this directory wiki be documented in the SIMtrace 2 wiki for users to get the latest firmware images without having to cross-compile themselves. Change-Id: I589531f59e54a0997b012bdd91e3bef9f847f517 --- M contrib/jenkins.sh 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/57/10357/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 4887da2..bf755b6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -54,4 +54,20 @@ make make clean +if [ "x$publish" = "x--publish" ]; then + echo + echo "=============== UPLOAD BUILD ==============" + mkdir out/ + cp firmware/bin/*.bin out/ + + cat > "$WORKSPACE/known_hosts" < -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 14:51:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 6 Aug 2018 14:51:39 +0000 Subject: Change in osmo-bsc[master]: GSCON: avoid sending connection oriented data when not connected In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10333 to look at the new patch set (#2). Change subject: GSCON: avoid sending connection oriented data when not connected ...................................................................... GSCON: avoid sending connection oriented data when not connected When no connection is present and had never existed, then conn->sccp.msc is unpopulated. However, there may be situations where osmo_bsc_sigtran_send() is executed while no connection is present. At the moment we assert on conn->sccp.msc, which would cause osmo-bsc to exit. In order to avoid this, better check conn->sccp.msc and drop the sccp message when the check is negative. - Remove assertion, add check. Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Related: OS#3446 --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/10333/2 -- To view, visit https://gerrit.osmocom.org/10333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Gerrit-Change-Number: 10333 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 15:51:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 15:51:52 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Fix libusrp and other non-osmocom builds Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10358 Change subject: osmocom-nightly-packages: Fix libusrp and other non-osmocom builds ...................................................................... osmocom-nightly-packages: Fix libusrp and other non-osmocom builds We're using the build() function not only to build osmocom projects requiring a .tarball-version file, but also other projects such as libusrp. Let's make the related git-buildpackage arguments conditional to whether or not a .tarball-version file exists at all. Change-Id: I0312a6671e739b803beb583769e4dfc6f44fa091 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/10358/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 068c3fa..f2bf9b1 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -89,10 +89,14 @@ mkdir -p "$DATA/$name" # source code build without dependency checks and unsigned source and unsigned change log - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ - --git-ignore-new \ - --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' \ - $gitbpargs + if [ -f .tarball-version ]; then + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-ignore-new $gitbpargs \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + else + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-ignore-new $gitbpargs + fi mv "$DATA/$name/"*.tar* "$DATA/$name/"*.dsc "$oscdir/" @@ -128,7 +132,6 @@ git clone https://github.com/myriadrf/LimeSuite limesuite cd limesuite git checkout "$TAG" - touch .tarball-version } build_osmocom() { -- To view, visit https://gerrit.osmocom.org/10358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0312a6671e739b803beb583769e4dfc6f44fa091 Gerrit-Change-Number: 10358 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 15:52:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 15:52:37 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Fix libusrp and other non-osmocom builds In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10358 ) Change subject: osmocom-nightly-packages: Fix libusrp and other non-osmocom builds ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0312a6671e739b803beb583769e4dfc6f44fa091 Gerrit-Change-Number: 10358 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 06 Aug 2018 15:52:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 15:52:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 15:52:40 +0000 Subject: Change in osmo-ci[master]: osmocom-nightly-packages: Fix libusrp and other non-osmocom builds In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10358 ) Change subject: osmocom-nightly-packages: Fix libusrp and other non-osmocom builds ...................................................................... osmocom-nightly-packages: Fix libusrp and other non-osmocom builds We're using the build() function not only to build osmocom projects requiring a .tarball-version file, but also other projects such as libusrp. Let's make the related git-buildpackage arguments conditional to whether or not a .tarball-version file exists at all. Change-Id: I0312a6671e739b803beb583769e4dfc6f44fa091 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 068c3fa..f2bf9b1 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -89,10 +89,14 @@ mkdir -p "$DATA/$name" # source code build without dependency checks and unsigned source and unsigned change log - gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ - --git-ignore-new \ - --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' \ - $gitbpargs + if [ -f .tarball-version ]; then + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-ignore-new $gitbpargs \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + else + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \ + --git-ignore-new $gitbpargs + fi mv "$DATA/$name/"*.tar* "$DATA/$name/"*.dsc "$oscdir/" @@ -128,7 +132,6 @@ git clone https://github.com/myriadrf/LimeSuite limesuite cd limesuite git checkout "$TAG" - touch .tarball-version } build_osmocom() { -- To view, visit https://gerrit.osmocom.org/10358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0312a6671e739b803beb583769e4dfc6f44fa091 Gerrit-Change-Number: 10358 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 15:53:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 15:53:50 +0000 Subject: Change in simtrace2[master]: jenkins: add build uploads In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10357 ) Change subject: jenkins: add build uploads ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I589531f59e54a0997b012bdd91e3bef9f847f517 Gerrit-Change-Number: 10357 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 15:53:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 15:53:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 15:53:51 +0000 Subject: Change in simtrace2[master]: jenkins: add build uploads In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10357 ) Change subject: jenkins: add build uploads ...................................................................... jenkins: add build uploads firmware binaries should be uploaded to https://ftp.osmocom.org/binaries/simtrace2/firmware/ this directory wiki be documented in the SIMtrace 2 wiki for users to get the latest firmware images without having to cross-compile themselves. Change-Id: I589531f59e54a0997b012bdd91e3bef9f847f517 --- M contrib/jenkins.sh 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 4887da2..bf755b6 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -54,4 +54,20 @@ make make clean +if [ "x$publish" = "x--publish" ]; then + echo + echo "=============== UPLOAD BUILD ==============" + mkdir out/ + cp firmware/bin/*.bin out/ + + cat > "$WORKSPACE/known_hosts" < Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 15:57:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 15:57:04 +0000 Subject: Change in osmo-bsc[master]: GSCON: avoid sending connection oriented data when not connected In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10333 ) Change subject: GSCON: avoid sending connection oriented data when not connected ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/10333/2/src/osmo-bsc/osmo_bsc_sigtran.c File src/osmo-bsc/osmo_bsc_sigtran.c: https://gerrit.osmocom.org/#/c/10333/2/src/osmo-bsc/osmo_bsc_sigtran.c at 354 PS2, Line 354: return -EINVAL; are we sure that msg doesn't need to be free'd here? It's typically good practise to write the msgb ownership aspects of a function in the comment (whether or not in doxygen format) on top of each function. Unfortunately this function doesn't have this, so we have to read more code... https://gerrit.osmocom.org/#/c/10333/2/src/osmo-bsc/osmo_bsc_sigtran.c at 377 PS2, Line 377: return -EINVAL; we also appear to have another memory leak of msg here. https://gerrit.osmocom.org/#/c/10333/2/src/osmo-bsc/osmo_bsc_sigtran.c at 387 PS2, Line 387: osmo_sccp_tx_data_msg this function will msgb_free() the msg, see the libosmo-sccp code. -- To view, visit https://gerrit.osmocom.org/10333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Gerrit-Change-Number: 10333 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 15:57:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 16:10:20 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 6 Aug 2018 16:10:20 +0000 Subject: Change in simtrace2[master]: gcc: fix warning Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10359 Change subject: gcc: fix warning ...................................................................... gcc: fix warning moving the define after the header fixes the following warning: from ./atmel_softpack_libraries/libchip_sam3s/source/exceptions.c:46: libcommon/include/stdio.h:63:12: warning: redundant redeclaration of 'printf_sync' [-Wredundant-decls] signed int printf_sync(const char *pFormat, ...); ^~~~~~~~~~~ ./atmel_softpack_libraries/libchip_sam3s/source/exceptions.c:45:16: note: previous declaration of 'printf_sync' was here #define printf printf_sync ^~~~~~~~~~~ libcommon/include/stdio.h:51:12: note: in expansion of macro 'printf' signed int printf(const char *pFormat, ...); Change-Id: I21a8de325e8f8b91297dd157f2d6a0f64434bb28 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/59/10359/1 diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c index 6d2a135..4799eae 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c @@ -42,8 +42,8 @@ * Headers *----------------------------------------------------------------------------*/ -#define printf printf_sync #include "chip.h" +#define printf printf_sync /*---------------------------------------------------------------------------- * Exported functions -- To view, visit https://gerrit.osmocom.org/10359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I21a8de325e8f8b91297dd157f2d6a0f64434bb28 Gerrit-Change-Number: 10359 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 16:10:20 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 6 Aug 2018 16:10:20 +0000 Subject: Change in simtrace2[master]: USB: increase USB reset time Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10360 Change subject: USB: increase USB reset time ...................................................................... USB: increase USB reset time USB reset can be signaled by pulling low USB D+ for at least 10 ms, according to the USB specification. This force a re-enumeration. This time is increased to 20 ms to work with more USB HUBs. Some SAM3S based board have external D+ pull-up mechanism (such as SIMtrace) which needs to be used to pull D+ low. This is a legacy mechanism from SAM7S history. This mechanism is not required anymore on the SAM3S, and the qmod does not use it. In this case D+ can be pulled low using PIO. This board difference is not defined on the board header. Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 --- M firmware/apps/dfu/main.c M firmware/libboard/common/include/board_common.h M firmware/libboard/simtrace/include/board.h M firmware/libcommon/source/usb.c 4 files changed, 26 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/60/10360/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 74268ad..9dd06ec 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -294,11 +294,21 @@ TRACE_INFO("USB init...\n\r"); /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ +#ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; PIO_Configure(&usb_dp_pullup, 1); PIO_Set(&usb_dp_pullup); - mdelay(15); +#endif + + const Pin usb_dp = {PIO_PB11, PIOB, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT}; + PIO_Configure(&usb_dp, 1); + PIO_Clear(&usb_dp); + mdelay(20); + +#ifdef PIN_USB_PULLUP PIO_Clear(&usb_dp_pullup); +#endif + USBDFU_Initialize(&dfu_descriptors); while (USBD_GetState() < USBD_STATE_CONFIGURED) { diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 06d3d6a..1b29680 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -114,15 +114,8 @@ #define SIM_PWEN PIO_PA5 #define VCC_FWD PIO_PA26 -/** Pin configuration to control USB pull-up on D+ - * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high - */ -#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} - // Board has UDP controller #define BOARD_USB_UDP -// D+ has external pull-up -#define BOARD_USB_PULLUP_EXTERNAL #define BOARD_USB_DFU #define BOARD_DFU_BOOT_SIZE (16 * 1024) diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index db3a925..6751863 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -117,6 +117,11 @@ /* SPI flash write protect pin (active low, pulled low) */ #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} +/** Pin configuration to control USB pull-up on D+ + * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high + */ +#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} + /** USB definitions */ /* OpenMoko SIMtrace 2 USB vendor ID */ #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index e929a05..2864860 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -576,11 +576,20 @@ { /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ +#ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; PIO_Configure(&usb_dp_pullup, 1); PIO_Set(&usb_dp_pullup); - mdelay(15); +#endif + + const Pin usb_dp = {PIO_PB11, PIOB, ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT}; + PIO_Configure(&usb_dp, 1); + PIO_Clear(&usb_dp); + mdelay(20); + +#ifdef PIN_USB_PULLUP PIO_Clear(&usb_dp_pullup); +#endif // Get std USB driver USBDDriver *pUsbd = USBD_GetDriver(); -- To view, visit https://gerrit.osmocom.org/10360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 Gerrit-Change-Number: 10360 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 6 16:30:10 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:30:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b6877a63cf43_20605fc68412227a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 112s] CC msc_main.o [ 112s] CCLD osmo-msc [ 113s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 113s] Makefile:462: recipe for target 'osmo-msc' failed [ 113s] make[4]: *** [osmo-msc] Error 1 [ 113s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 113s] Makefile:410: recipe for target 'all-recursive' failed [ 113s] make[3]: *** [all-recursive] Error 1 [ 113s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 113s] Makefile:446: recipe for target 'all-recursive' failed [ 113s] make[2]: *** [all-recursive] Error 1 [ 113s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 113s] Makefile:377: recipe for target 'all' failed [ 113s] make[1]: *** [all] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s] dh_auto_build: make -j1 returned exit code 2 [ 113s] debian/rules:45: recipe for target 'build' failed [ 113s] make: *** [build] Error 2 [ 113s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 113s] [ 113s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:30:05 UTC 2018. [ 113s] [ 113s] ### VM INTERACTION START ### [ 114s] Powering off. [ 114s] [ 96.789952] reboot: Power down [ 114s] ### VM INTERACTION END ### [ 114s] [ 114s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:30:07 UTC 2018. [ 114s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:30:10 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:30:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b6877a59e921_20605fc6841222623@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 112s] CC msc_main.o [ 112s] CCLD osmo-msc [ 113s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 113s] Makefile:462: recipe for target 'osmo-msc' failed [ 113s] make[4]: *** [osmo-msc] Error 1 [ 113s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 113s] Makefile:410: recipe for target 'all-recursive' failed [ 113s] make[3]: *** [all-recursive] Error 1 [ 113s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 113s] Makefile:446: recipe for target 'all-recursive' failed [ 113s] make[2]: *** [all-recursive] Error 1 [ 113s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 113s] Makefile:377: recipe for target 'all' failed [ 113s] make[1]: *** [all] Error 2 [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s] dh_auto_build: make -j1 returned exit code 2 [ 113s] debian/rules:45: recipe for target 'build' failed [ 113s] make: *** [build] Error 2 [ 113s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 113s] [ 113s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:30:05 UTC 2018. [ 113s] [ 113s] ### VM INTERACTION START ### [ 114s] Powering off. [ 114s] [ 96.789952] reboot: Power down [ 114s] ### VM INTERACTION END ### [ 114s] [ 114s] lamb58 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:30:07 UTC 2018. [ 114s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:31:35 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:31:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b68780360e8e_20605fc68412232f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 101s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 102s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libosmovty.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libsmpp34.so /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 102s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 102s] Makefile:473: recipe for target 'osmo-msc' failed [ 102s] make[4]: *** [osmo-msc] Error 1 [ 102s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 102s] Makefile:422: recipe for target 'all-recursive' failed [ 102s] make[3]: *** [all-recursive] Error 1 [ 102s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 102s] Makefile:458: recipe for target 'all-recursive' failed [ 102s] make[2]: *** [all-recursive] Error 1 [ 102s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 102s] Makefile:390: recipe for target 'all' failed [ 102s] make[1]: *** [all] Error 2 [ 102s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 102s] dh_auto_build: make -j1 returned exit code 2 [ 102s] debian/rules:45: recipe for target 'build' failed [ 102s] make: *** [build] Error 2 [ 102s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 102s] [ 102s] lamb20 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:31:20 UTC 2018. [ 102s] [ 102s] ### VM INTERACTION START ### [ 105s] [ 91.863348] sysrq: SysRq : Power Off [ 105s] [ 91.885277] reboot: Power down [ 105s] ### VM INTERACTION END ### [ 105s] [ 105s] lamb20 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:31:24 UTC 2018. [ 105s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:31:35 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:31:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b687803b6a03_20605fc684122336a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 101s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 102s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libosmovty.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libsmpp34.so /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 102s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 102s] Makefile:473: recipe for target 'osmo-msc' failed [ 102s] make[4]: *** [osmo-msc] Error 1 [ 102s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 102s] Makefile:422: recipe for target 'all-recursive' failed [ 102s] make[3]: *** [all-recursive] Error 1 [ 102s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 102s] Makefile:458: recipe for target 'all-recursive' failed [ 102s] make[2]: *** [all-recursive] Error 1 [ 102s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 102s] Makefile:390: recipe for target 'all' failed [ 102s] make[1]: *** [all] Error 2 [ 102s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 102s] dh_auto_build: make -j1 returned exit code 2 [ 102s] debian/rules:45: recipe for target 'build' failed [ 102s] make: *** [build] Error 2 [ 102s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 102s] [ 102s] lamb20 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:31:20 UTC 2018. [ 102s] [ 102s] ### VM INTERACTION START ### [ 105s] [ 91.863348] sysrq: SysRq : Power Off [ 105s] [ 91.885277] reboot: Power down [ 105s] ### VM INTERACTION END ### [ 105s] [ 105s] lamb20 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:31:24 UTC 2018. [ 105s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:32:43 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:32:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b68783d47ea9_20605fc6841223685@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 175s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 175s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 175s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 175s] Makefile:473: recipe for target 'osmo-msc' failed [ 175s] make[4]: *** [osmo-msc] Error 1 [ 175s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 175s] Makefile:422: recipe for target 'all-recursive' failed [ 175s] make[3]: *** [all-recursive] Error 1 [ 175s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 175s] Makefile:458: recipe for target 'all-recursive' failed [ 175s] make[2]: *** [all-recursive] Error 1 [ 175s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 175s] Makefile:390: recipe for target 'all' failed [ 175s] make[1]: *** [all] Error 2 [ 175s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 175s] dh_auto_build: make -j1 returned exit code 2 [ 175s] debian/rules:45: recipe for target 'build' failed [ 175s] make: *** [build] Error 2 [ 175s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 175s] [ 176s] lamb51 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:32:32 UTC 2018. [ 176s] [ 176s] ### VM INTERACTION START ### [ 179s] [ 150.480195] sysrq: SysRq : Power Off [ 179s] [ 150.491834] reboot: Power down [ 179s] ### VM INTERACTION END ### [ 179s] [ 179s] lamb51 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:32:36 UTC 2018. [ 179s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:32:43 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:32:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b68783f41791_20605fc68412238f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 175s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 175s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 175s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 175s] Makefile:473: recipe for target 'osmo-msc' failed [ 175s] make[4]: *** [osmo-msc] Error 1 [ 175s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 175s] Makefile:422: recipe for target 'all-recursive' failed [ 175s] make[3]: *** [all-recursive] Error 1 [ 175s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 175s] Makefile:458: recipe for target 'all-recursive' failed [ 175s] make[2]: *** [all-recursive] Error 1 [ 175s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 175s] Makefile:390: recipe for target 'all' failed [ 175s] make[1]: *** [all] Error 2 [ 175s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 175s] dh_auto_build: make -j1 returned exit code 2 [ 175s] debian/rules:45: recipe for target 'build' failed [ 175s] make: *** [build] Error 2 [ 175s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 175s] [ 176s] lamb51 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:32:32 UTC 2018. [ 176s] [ 176s] ### VM INTERACTION START ### [ 179s] [ 150.480195] sysrq: SysRq : Power Off [ 179s] [ 150.491834] reboot: Power down [ 179s] ### VM INTERACTION END ### [ 179s] [ 179s] lamb51 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:32:36 UTC 2018. [ 179s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:33:51 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:33:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b68787d87ca4_20605fc68412244fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 75s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 75s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 75s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 75s] Makefile:473: recipe for target 'osmo-msc' failed [ 75s] make[4]: *** [osmo-msc] Error 1 [ 75s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 75s] Makefile:422: recipe for target 'all-recursive' failed [ 75s] make[3]: *** [all-recursive] Error 1 [ 75s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 75s] Makefile:458: recipe for target 'all-recursive' failed [ 75s] make[2]: *** [all-recursive] Error 1 [ 75s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 75s] Makefile:390: recipe for target 'all' failed [ 75s] make[1]: *** [all] Error 2 [ 75s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 75s] dh_auto_build: make -j1 returned exit code 2 [ 75s] debian/rules:45: recipe for target 'build' failed [ 75s] make: *** [build] Error 2 [ 75s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 76s] [ 76s] sheep84 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:33:43 UTC 2018. [ 76s] [ 76s] ### VM INTERACTION START ### [ 79s] [ 70.405204] sysrq: SysRq : Power Off [ 79s] [ 70.411666] reboot: Power down [ 79s] ### VM INTERACTION END ### [ 79s] [ 79s] sheep84 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:33:46 UTC 2018. [ 79s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:33:51 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:33:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b68787e522aa_20605fc68412245a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 75s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 75s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 75s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 75s] Makefile:473: recipe for target 'osmo-msc' failed [ 75s] make[4]: *** [osmo-msc] Error 1 [ 75s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 75s] Makefile:422: recipe for target 'all-recursive' failed [ 75s] make[3]: *** [all-recursive] Error 1 [ 75s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 75s] Makefile:458: recipe for target 'all-recursive' failed [ 75s] make[2]: *** [all-recursive] Error 1 [ 75s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 75s] Makefile:390: recipe for target 'all' failed [ 75s] make[1]: *** [all] Error 2 [ 75s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 75s] dh_auto_build: make -j1 returned exit code 2 [ 75s] debian/rules:45: recipe for target 'build' failed [ 75s] make: *** [build] Error 2 [ 75s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 76s] [ 76s] sheep84 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:33:43 UTC 2018. [ 76s] [ 76s] ### VM INTERACTION START ### [ 79s] [ 70.405204] sysrq: SysRq : Power Off [ 79s] [ 70.411666] reboot: Power down [ 79s] ### VM INTERACTION END ### [ 79s] [ 79s] sheep84 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:33:46 UTC 2018. [ 79s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:34:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:34:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b68789e24cfd_20605fc6841224946@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 111s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 112s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 112s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 112s] Makefile:473: recipe for target 'osmo-msc' failed [ 112s] make[4]: *** [osmo-msc] Error 1 [ 112s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 112s] Makefile:422: recipe for target 'all-recursive' failed [ 112s] make[3]: *** [all-recursive] Error 1 [ 112s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 112s] Makefile:458: recipe for target 'all-recursive' failed [ 112s] make[2]: *** [all-recursive] Error 1 [ 112s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 112s] Makefile:390: recipe for target 'all' failed [ 112s] make[1]: *** [all] Error 2 [ 112s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 112s] dh_auto_build: make -j1 returned exit code 2 [ 112s] debian/rules:45: recipe for target 'build' failed [ 112s] make: *** [build] Error 2 [ 112s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 112s] [ 112s] lamb03 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:05 UTC 2018. [ 112s] [ 112s] ### VM INTERACTION START ### [ 115s] [ 103.290655] sysrq: SysRq : Power Off [ 115s] [ 103.295448] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] lamb03 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:09 UTC 2018. [ 115s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:34:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:34:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b68789e91253_20605fc68412250ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 111s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 112s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 112s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 112s] Makefile:473: recipe for target 'osmo-msc' failed [ 112s] make[4]: *** [osmo-msc] Error 1 [ 112s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 112s] Makefile:422: recipe for target 'all-recursive' failed [ 112s] make[3]: *** [all-recursive] Error 1 [ 112s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 112s] Makefile:458: recipe for target 'all-recursive' failed [ 112s] make[2]: *** [all-recursive] Error 1 [ 112s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 112s] Makefile:390: recipe for target 'all' failed [ 112s] make[1]: *** [all] Error 2 [ 112s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 112s] dh_auto_build: make -j1 returned exit code 2 [ 112s] debian/rules:45: recipe for target 'build' failed [ 112s] make: *** [build] Error 2 [ 112s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 112s] [ 112s] lamb03 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:05 UTC 2018. [ 112s] [ 112s] ### VM INTERACTION START ### [ 115s] [ 103.290655] sysrq: SysRq : Power Off [ 115s] [ 103.295448] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] lamb03 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:09 UTC 2018. [ 115s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:34:42 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:34:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b6878ba437ae_20605fc6841225130@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 153s] CC msc_main.o [ 153s] CCLD osmo-msc [ 154s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 154s] Makefile:462: recipe for target 'osmo-msc' failed [ 154s] make[4]: *** [osmo-msc] Error 1 [ 154s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 154s] Makefile:410: recipe for target 'all-recursive' failed [ 154s] make[3]: *** [all-recursive] Error 1 [ 154s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 154s] Makefile:446: recipe for target 'all-recursive' failed [ 154s] make[2]: *** [all-recursive] Error 1 [ 154s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 154s] Makefile:377: recipe for target 'all' failed [ 154s] make[1]: *** [all] Error 2 [ 154s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 154s] dh_auto_build: make -j1 returned exit code 2 [ 154s] debian/rules:45: recipe for target 'build' failed [ 154s] make: *** [build] Error 2 [ 154s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 154s] [ 154s] cloud109 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:27 UTC 2018. [ 154s] [ 154s] ### VM INTERACTION START ### [ 155s] Powering off. [ 155s] [ 130.881648] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] cloud109 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:30 UTC 2018. [ 156s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:34:42 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:34:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b6878ba85c41_20605fc6841225247@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 153s] CC msc_main.o [ 153s] CCLD osmo-msc [ 154s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 154s] Makefile:462: recipe for target 'osmo-msc' failed [ 154s] make[4]: *** [osmo-msc] Error 1 [ 154s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 154s] Makefile:410: recipe for target 'all-recursive' failed [ 154s] make[3]: *** [all-recursive] Error 1 [ 154s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 154s] Makefile:446: recipe for target 'all-recursive' failed [ 154s] make[2]: *** [all-recursive] Error 1 [ 154s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 154s] Makefile:377: recipe for target 'all' failed [ 154s] make[1]: *** [all] Error 2 [ 154s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 154s] dh_auto_build: make -j1 returned exit code 2 [ 154s] debian/rules:45: recipe for target 'build' failed [ 154s] make: *** [build] Error 2 [ 154s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 154s] [ 154s] cloud109 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:27 UTC 2018. [ 154s] [ 154s] ### VM INTERACTION START ### [ 155s] Powering off. [ 155s] [ 130.881648] reboot: Power down [ 156s] ### VM INTERACTION END ### [ 156s] [ 156s] cloud109 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:34:30 UTC 2018. [ 156s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:35:52 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:35:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b6878f5935e6_20605fc68412253b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 92s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 92s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libosmovty.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libsmpp34.so /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 92s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 92s] Makefile:473: recipe for target 'osmo-msc' failed [ 92s] make[4]: *** [osmo-msc] Error 1 [ 92s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 92s] Makefile:422: recipe for target 'all-recursive' failed [ 92s] make[3]: *** [all-recursive] Error 1 [ 92s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 92s] Makefile:458: recipe for target 'all-recursive' failed [ 92s] make[2]: *** [all-recursive] Error 1 [ 92s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 92s] Makefile:390: recipe for target 'all' failed [ 92s] make[1]: *** [all] Error 2 [ 92s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 92s] dh_auto_build: make -j1 returned exit code 2 [ 92s] debian/rules:45: recipe for target 'build' failed [ 92s] make: *** [build] Error 2 [ 92s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 92s] [ 92s] lamb11 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:35:46 UTC 2018. [ 92s] [ 92s] ### VM INTERACTION START ### [ 95s] [ 84.311657] sysrq: SysRq : Power Off [ 95s] [ 84.318221] reboot: Power down [ 95s] ### VM INTERACTION END ### [ 95s] [ 95s] lamb11 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:35:50 UTC 2018. [ 95s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:35:52 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:35:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b6878f5dfe57_20605fc6841225475@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 92s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 92s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libosmovty.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libsmpp34.so /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 92s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 92s] Makefile:473: recipe for target 'osmo-msc' failed [ 92s] make[4]: *** [osmo-msc] Error 1 [ 92s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 92s] Makefile:422: recipe for target 'all-recursive' failed [ 92s] make[3]: *** [all-recursive] Error 1 [ 92s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 92s] Makefile:458: recipe for target 'all-recursive' failed [ 92s] make[2]: *** [all-recursive] Error 1 [ 92s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 92s] Makefile:390: recipe for target 'all' failed [ 92s] make[1]: *** [all] Error 2 [ 92s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 92s] dh_auto_build: make -j1 returned exit code 2 [ 92s] debian/rules:45: recipe for target 'build' failed [ 92s] make: *** [build] Error 2 [ 92s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 92s] [ 92s] lamb11 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:35:46 UTC 2018. [ 92s] [ 92s] ### VM INTERACTION START ### [ 95s] [ 84.311657] sysrq: SysRq : Power Off [ 95s] [ 84.318221] reboot: Power down [ 95s] ### VM INTERACTION END ### [ 95s] [ 95s] lamb11 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:35:50 UTC 2018. [ 95s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:36:26 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:36:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b687911e83d7_20605fc684122554a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 115s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 116s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 116s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 116s] Makefile:473: recipe for target 'osmo-msc' failed [ 116s] make[4]: *** [osmo-msc] Error 1 [ 116s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 116s] Makefile:422: recipe for target 'all-recursive' failed [ 116s] make[3]: *** [all-recursive] Error 1 [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 116s] Makefile:458: recipe for target 'all-recursive' failed [ 116s] make[2]: *** [all-recursive] Error 1 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 116s] Makefile:390: recipe for target 'all' failed [ 116s] make[1]: *** [all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] dh_auto_build: make -j1 returned exit code 2 [ 116s] debian/rules:45: recipe for target 'build' failed [ 116s] make: *** [build] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] [ 116s] lamb65 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:36:16 UTC 2018. [ 116s] [ 116s] ### VM INTERACTION START ### [ 119s] [ 107.824123] sysrq: SysRq : Power Off [ 119s] [ 107.832352] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb65 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:36:19 UTC 2018. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:36:26 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:36:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b6879136b6c0_20605fc6841225638@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 115s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 116s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/i386-linux-gnu/libosmovty.so -ltalloc /usr/lib/i386-linux-gnu/libosmoctrl.so /usr/lib/i386-linux-gnu/libosmogsm.so /usr/lib/i386-linux-gnu/libosmocore.so /usr/lib/i386-linux-gnu/libosmoabis.so /usr/lib/i386-linux-gnu/libsmpp34.so /usr/lib/i386-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/i386-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 116s] gcc: error: /usr/lib/i386-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 116s] Makefile:473: recipe for target 'osmo-msc' failed [ 116s] make[4]: *** [osmo-msc] Error 1 [ 116s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 116s] Makefile:422: recipe for target 'all-recursive' failed [ 116s] make[3]: *** [all-recursive] Error 1 [ 116s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 116s] Makefile:458: recipe for target 'all-recursive' failed [ 116s] make[2]: *** [all-recursive] Error 1 [ 116s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 116s] Makefile:390: recipe for target 'all' failed [ 116s] make[1]: *** [all] Error 2 [ 116s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 116s] dh_auto_build: make -j1 returned exit code 2 [ 116s] debian/rules:45: recipe for target 'build' failed [ 116s] make: *** [build] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 116s] [ 116s] lamb65 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:36:16 UTC 2018. [ 116s] [ 116s] ### VM INTERACTION START ### [ 119s] [ 107.824123] sysrq: SysRq : Power Off [ 119s] [ 107.832352] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb65 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:36:19 UTC 2018. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 6 16:37:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 16:37:58 +0000 Subject: Change in osmo-hlr[master]: debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10361 Change subject: debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 ...................................................................... debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 The -dev package should depend on the binary package. Change-Id: I01e58788e8485cadecad8b8788887743b41b9f1f --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/61/10361/1 diff --git a/debian/control b/debian/control index 222cd96..23c39ce 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, + libosmo-gsup-client0 (= ${binary:Version}), libosmocore-dev Description: Development headers of Osmocom GSUP client library This is a shared library that can be used to implement client programs for -- To view, visit https://gerrit.osmocom.org/10361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I01e58788e8485cadecad8b8788887743b41b9f1f Gerrit-Change-Number: 10361 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 16:41:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 16:41:20 +0000 Subject: Change in osmo-hlr[master]: debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10361 ) Change subject: debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01e58788e8485cadecad8b8788887743b41b9f1f Gerrit-Change-Number: 10361 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 16:41:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 16:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 16:41:29 +0000 Subject: Change in osmo-hlr[master]: debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10361 ) Change subject: debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 ...................................................................... debian: Make libosmo-gsup-client-dev depend on libosmo-gsup-client0 The -dev package should depend on the binary package. Change-Id: I01e58788e8485cadecad8b8788887743b41b9f1f --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/debian/control b/debian/control index 222cd96..23c39ce 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, + libosmo-gsup-client0 (= ${binary:Version}), libosmocore-dev Description: Development headers of Osmocom GSUP client library This is a shared library that can be used to implement client programs for -- To view, visit https://gerrit.osmocom.org/10361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I01e58788e8485cadecad8b8788887743b41b9f1f Gerrit-Change-Number: 10361 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 6 16:47:04 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:47:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b687ba7bb341_20605fc6841229094@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 126s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 127s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libosmovty.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libsmpp34.so /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 127s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 127s] Makefile:473: recipe for target 'osmo-msc' failed [ 127s] make[4]: *** [osmo-msc] Error 1 [ 127s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 127s] Makefile:422: recipe for target 'all-recursive' failed [ 127s] make[3]: *** [all-recursive] Error 1 [ 127s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 127s] Makefile:458: recipe for target 'all-recursive' failed [ 127s] make[2]: *** [all-recursive] Error 1 [ 127s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 127s] Makefile:390: recipe for target 'all' failed [ 127s] make[1]: *** [all] Error 2 [ 127s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 127s] dh_auto_build: make -j1 returned exit code 2 [ 127s] debian/rules:45: recipe for target 'build' failed [ 127s] make: *** [build] Error 2 [ 127s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 127s] [ 127s] cloud122 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:46:44 UTC 2018. [ 127s] [ 127s] ### VM INTERACTION START ### [ 130s] [ 110.967634] sysrq: SysRq : Power Off [ 130s] [ 110.971699] reboot: Power down [ 132s] ### VM INTERACTION END ### [ 132s] [ 132s] cloud122 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:46:50 UTC 2018. [ 132s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 6 16:47:04 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 06 Aug 2018 16:47:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b687ba738c61_20605fc68412289b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 126s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -losmoabis -lsmpp34 -losmo-sigtran -losmo-mgcp-client -losmo-gsup-client -ldbi -losmo-ranap [ 127s] libtool: link: gcc -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=null-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -o osmo-msc msc_main.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libosmovty.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libsmpp34.so /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -ldbi -losmo-ranap [ 127s] gcc: error: /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so: No such file or directory [ 127s] Makefile:473: recipe for target 'osmo-msc' failed [ 127s] make[4]: *** [osmo-msc] Error 1 [ 127s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-msc' [ 127s] Makefile:422: recipe for target 'all-recursive' failed [ 127s] make[3]: *** [all-recursive] Error 1 [ 127s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 127s] Makefile:458: recipe for target 'all-recursive' failed [ 127s] make[2]: *** [all-recursive] Error 1 [ 127s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 127s] Makefile:390: recipe for target 'all' failed [ 127s] make[1]: *** [all] Error 2 [ 127s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 127s] dh_auto_build: make -j1 returned exit code 2 [ 127s] debian/rules:45: recipe for target 'build' failed [ 127s] make: *** [build] Error 2 [ 127s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 127s] [ 127s] cloud122 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:46:44 UTC 2018. [ 127s] [ 127s] ### VM INTERACTION START ### [ 130s] [ 110.967634] sysrq: SysRq : Power Off [ 130s] [ 110.971699] reboot: Power down [ 132s] ### VM INTERACTION END ### [ 132s] [ 132s] cloud122 failed "build osmo-msc_1.2.0.40.6cc37.dsc" at Mon Aug 6 16:46:50 UTC 2018. [ 132s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 6 19:40:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 19:40:28 +0000 Subject: Change in docker-playground[master]: osmo-msc-master: Add dependency to libosmo-gsup-client-dev Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10362 Change subject: osmo-msc-master: Add dependency to libosmo-gsup-client-dev ...................................................................... osmo-msc-master: Add dependency to libosmo-gsup-client-dev Change-Id: I9e7e64993f1416bbee48d24f3c10e5eee56cede7 --- M osmo-msc-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/10362/1 diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 6fe9b3d..19de3a1 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -19,6 +19,7 @@ libosmo-abis-dev \ libosmo-legacy-mgcp-dev \ libosmo-mgcp-client-dev \ + libosmo-gsup-client-dev \ libosmo-netif-dev \ libosmo-ranap-dev \ libosmo-sccp-dev \ -- To view, visit https://gerrit.osmocom.org/10362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9e7e64993f1416bbee48d24f3c10e5eee56cede7 Gerrit-Change-Number: 10362 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 19:40:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 19:40:41 +0000 Subject: Change in docker-playground[master]: osmo-msc-master: Add dependency to libosmo-gsup-client-dev In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10362 ) Change subject: osmo-msc-master: Add dependency to libosmo-gsup-client-dev ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e7e64993f1416bbee48d24f3c10e5eee56cede7 Gerrit-Change-Number: 10362 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 06 Aug 2018 19:40:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 19:40:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 19:40:44 +0000 Subject: Change in docker-playground[master]: osmo-msc-master: Add dependency to libosmo-gsup-client-dev In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10362 ) Change subject: osmo-msc-master: Add dependency to libosmo-gsup-client-dev ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e7e64993f1416bbee48d24f3c10e5eee56cede7 Gerrit-Change-Number: 10362 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 06 Aug 2018 19:40:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 19:40:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 19:40:46 +0000 Subject: Change in docker-playground[master]: osmo-msc-master: Add dependency to libosmo-gsup-client-dev In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10362 ) Change subject: osmo-msc-master: Add dependency to libosmo-gsup-client-dev ...................................................................... osmo-msc-master: Add dependency to libosmo-gsup-client-dev Change-Id: I9e7e64993f1416bbee48d24f3c10e5eee56cede7 --- M osmo-msc-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 6fe9b3d..19de3a1 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -19,6 +19,7 @@ libosmo-abis-dev \ libosmo-legacy-mgcp-dev \ libosmo-mgcp-client-dev \ + libosmo-gsup-client-dev \ libosmo-netif-dev \ libosmo-ranap-dev \ libosmo-sccp-dev \ -- To view, visit https://gerrit.osmocom.org/10362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9e7e64993f1416bbee48d24f3c10e5eee56cede7 Gerrit-Change-Number: 10362 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 19:41:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 19:41:07 +0000 Subject: Change in simtrace2[master]: gcc: fix warning In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10359 ) Change subject: gcc: fix warning ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I21a8de325e8f8b91297dd157f2d6a0f64434bb28 Gerrit-Change-Number: 10359 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 19:41:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 19:41:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 19:41:08 +0000 Subject: Change in simtrace2[master]: gcc: fix warning In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10359 ) Change subject: gcc: fix warning ...................................................................... gcc: fix warning moving the define after the header fixes the following warning: from ./atmel_softpack_libraries/libchip_sam3s/source/exceptions.c:46: libcommon/include/stdio.h:63:12: warning: redundant redeclaration of 'printf_sync' [-Wredundant-decls] signed int printf_sync(const char *pFormat, ...); ^~~~~~~~~~~ ./atmel_softpack_libraries/libchip_sam3s/source/exceptions.c:45:16: note: previous declaration of 'printf_sync' was here #define printf printf_sync ^~~~~~~~~~~ libcommon/include/stdio.h:51:12: note: in expansion of macro 'printf' signed int printf(const char *pFormat, ...); Change-Id: I21a8de325e8f8b91297dd157f2d6a0f64434bb28 --- M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c index 6d2a135..4799eae 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c @@ -42,8 +42,8 @@ * Headers *----------------------------------------------------------------------------*/ -#define printf printf_sync #include "chip.h" +#define printf printf_sync /*---------------------------------------------------------------------------- * Exported functions -- To view, visit https://gerrit.osmocom.org/10359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I21a8de325e8f8b91297dd157f2d6a0f64434bb28 Gerrit-Change-Number: 10359 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 19:43:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 19:43:54 +0000 Subject: Change in simtrace2[master]: USB: increase USB reset time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10360 ) Change subject: USB: increase USB reset time ...................................................................... Patch Set 1: I'm somewhat unsure if this is needed. after all, so far this git repository only supports SAM3S based devices, which all have the ability pull the USB D+ line low internally inside the chip using register access to the USBD peripheral. The fact that some boards (notably simtrace) still have a GPIO for legacy reason shouldn't matter. I think we should always be using the SAM3S USBD internal pull-up functionality and ignore the pull-up/gpio that exist on old simtrace-1.x boards. What do you think? -- To view, visit https://gerrit.osmocom.org/10360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 Gerrit-Change-Number: 10360 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 06 Aug 2018 19:43:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 20:21:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 20:21:12 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10363 Change subject: hlr: Add chapter on USSD configuration ...................................................................... hlr: Add chapter on USSD configuration Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 --- A OsmoHLR/chapters/ussd.adoc M OsmoHLR/osmohlr-usermanual.adoc 2 files changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/63/10363/1 diff --git a/OsmoHLR/chapters/ussd.adoc b/OsmoHLR/chapters/ussd.adoc new file mode 100644 index 0000000..5e907a8 --- /dev/null +++ b/OsmoHLR/chapters/ussd.adoc @@ -0,0 +1,78 @@ +[[ussd]] +== Unstructured Supplementary Services Data (USSD) + +The _Unstructured Supplementary Services Data (USSD)_ is one service within +2G/3G networks next to other services such as circuit-switched voice, packet-switched +data and SMS (Short Message Service). + +It is on an abstract level quite similar to SMS in that USSD can be used to send +textual messages. However, there are the following differences: + +* USSD is between the MS (phone) and an USSD application on the network, while + SMS is primarily between two subscribers identified by their MSISDN +* USSD is faster, as it doesn't suffer from the complicated three-layer CP/RP/TP + protocol stack of SMS with it's acknowledgement of the acknowledged acknowledgement. +* USSD is session-oriented, i.e. a dialogue/session between subscriber and application + can persist for the transfer of more than one message. The dedicated radio channel + on the RAN remains established throughout that dialogue. + +=== USSD in Osmocom + +Until August 2018, OsmoMSC contained some minimalistic internal USSD +handling with no +ability to attach/extend it with external USSD applications. + +From August 2018 onwards, OsmoMSC doesn't contain any internal USSD +handlers/applications anymore. Instead, all USSD is transported to/from +OsmoHLR via the GSUP protocol. + +OsmoHLR contains some intenal USSD handlers and can route USSD messages +to any number of external USSD entities (EUSEs). The EUSE also use GSUP +to communicate USSD from/to OsmoHLR. + +Each EUSE is identified by its name. The name consists of a single-word +string preceding a currently fixed ("-00-00-00-00-00-00") suffix. +There is no authentication between EUSE and OsmoHLR: Any lient program +able to connect to the GSUP port of OsmoHLR can register as any EUSE +(name). + +NOTE:: We plan to remove the requirement for this suffix as soon as we +are done resolving all more important issues. + +=== USSD Configuration + +USSD configuration in OsmoHLR happens within the `hlr` VTY node. + +`euse foobar-00-00-00-00-00-00` defines an EUSE with the given name `foobar` + +`ussd route prefix *123 external foobar-00-00-00-00-00-00` installs a +prefix route to the named EUSE. All USSD short codes starting with *123 will be +routed to the named EUSE. + +`ussd route prefix *#100# internal own-msisdn` installs a prefix route +to the named internal USSD handler. There above command will restore +the old behavior, in which #*100# will return a text message containing +the subscribers own phone number. There is one other handler called +`own-imsi` which will return the IMSI instead of the MSISDN. + +`ussd default-route external foobar-00-00-00-00-00-00` installs a +default route to the named EUSE. This means that all USSD codes for +which no more specific route exists will be routed to the named EUSE. + +=== Example EUSE program + +We have provided an example EUSE developed in C language using existing +Osmocom libraries for GSUP protocol handling and USSD encoding/decoding. +It will register as `foobar` EUSE to OsmoHLR on localhost. You can run +it on a different machine by specifying e.g. `osmo-euse-demo 1.2.3.4 5678` +to make it connect to OsmoHLR on IP address 1.2.3.4 and GSUP/TCP port +5678. + +The idea is that you can use this as a template to develop your own USSD +applications, or any gateways to other protocols or interfaces. + +You can find it in `osmo-hlr/src/osmo-euse-demo.c` or online by +following the link to http://git.osmocom.org/osmo-hlr/tree/src/osmo-euse-demo.c + +This demonstration program will echo back any USSD message sent/routed +to it, quoted like _You sent "..."_. diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc index 043c971..d9a4654 100644 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ b/OsmoHLR/osmohlr-usermanual.adoc @@ -14,6 +14,8 @@ include::chapters/subscribers.adoc[] +include::chapters/ussd.adoc[] + include::../common/chapters/vty.adoc[] include::../common/chapters/logging.adoc[] -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 20:21:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 6 Aug 2018 20:21:40 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10363 ) Change subject: hlr: Add chapter on USSD configuration ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 06 Aug 2018 20:21:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 6 21:39:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 6 Aug 2018 21:39:51 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10363 ) Change subject: hlr: Add chapter on USSD configuration ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc File OsmoHLR/chapters/ussd.adoc: https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 35 PS1, Line 35: lient s/lient/client/ https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 44 PS1, Line 44: USSD configuration in OsmoHLR happens within the `hlr` VTY node. IDEA: maybe it makes sense to group all SS/USSD-related commands into a dedicated USSD_NODE? Just like the GSUP related commands... https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 46 PS1, Line 46: `euse foobar-00-00-00-00-00-00` defines an EUSE with the given name `foobar` AFAIR, this command also represents a separate EUSE_NODE, but there are no commands inside... I guess we are going to add some commands (e.g. auth config) there later, right? https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 54 PS1, Line 54: #*100# #* -> *# -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 06 Aug 2018 21:39:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Aug 7 04:02:42 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Aug 2018 04:02:42 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b6919f424644_20605fc68413804b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 59s] [196/217] installing base-files-9.9+deb9u5 [ 59s] Processing triggers for man-db (2.7.6.1-2) ... [ 59s] [197/217] installing libfdisk1-2.29.2-1+deb9u1 [ 59s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 59s] [198/217] installing libmount1-2.29.2-1+deb9u1 [ 59s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 60s] [199/217] installing doxygen-1.8.13-4+b1 [ 60s] Processing triggers for man-db (2.7.6.1-2) ... [ 60s] [200/217] installing bash-4.4-5 [ 60s] update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode [ 61s] Processing triggers for man-db (2.7.6.1-2) ... [ 61s] [201/217] installing libglib2.0-0-2.50.3-2 [ 61s] No schema files found: doing nothing. [ 61s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 61s] [202/217] installing mount-2.29.2-1+deb9u1 [ 61s] Processing triggers for man-db (2.7.6.1-2) ... [ 61s] [203/217] installing util-linux-2.29.2-1+deb9u1 [ 61s] insserv: Service mountdevsubfs has to be enabled to start service hwclock [ 61s] Processing triggers for man-db (2.7.6.1-2) ... [ 61s] [204/217] installing libcroco3-0.6.11-3 [ 61s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 62s] [205/217] installing pkg-config-0.29-4+b1 [28868s] qemu-system-x86_64: terminating on signal 15 from pid 7111 () Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [28868s] ### VM INTERACTION END ### [28868s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28868s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 7 04:02:42 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 07 Aug 2018 04:02:42 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b6919f3a5736_20605fc6841380331@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 59s] [196/217] installing base-files-9.9+deb9u5 [ 59s] Processing triggers for man-db (2.7.6.1-2) ... [ 59s] [197/217] installing libfdisk1-2.29.2-1+deb9u1 [ 59s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 59s] [198/217] installing libmount1-2.29.2-1+deb9u1 [ 59s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 60s] [199/217] installing doxygen-1.8.13-4+b1 [ 60s] Processing triggers for man-db (2.7.6.1-2) ... [ 60s] [200/217] installing bash-4.4-5 [ 60s] update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode [ 61s] Processing triggers for man-db (2.7.6.1-2) ... [ 61s] [201/217] installing libglib2.0-0-2.50.3-2 [ 61s] No schema files found: doing nothing. [ 61s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 61s] [202/217] installing mount-2.29.2-1+deb9u1 [ 61s] Processing triggers for man-db (2.7.6.1-2) ... [ 61s] [203/217] installing util-linux-2.29.2-1+deb9u1 [ 61s] insserv: Service mountdevsubfs has to be enabled to start service hwclock [ 61s] Processing triggers for man-db (2.7.6.1-2) ... [ 61s] [204/217] installing libcroco3-0.6.11-3 [ 61s] Processing triggers for libc-bin (2.24-11+deb9u3) ... [ 62s] [205/217] installing pkg-config-0.29-4+b1 [28868s] qemu-system-x86_64: terminating on signal 15 from pid 7111 () Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [28868s] ### VM INTERACTION END ### [28868s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28868s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Aug 7 09:24:07 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 09:24:07 +0000 Subject: Change in simtrace2[master]: jenkins: fix publish Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10364 Change subject: jenkins: fix publish ...................................................................... jenkins: fix publish the script argument was not saved in the publish variable used later to decide if publishing/uploading is needed. Change-Id: Ic768a8e96e5e4d72acf3979da1412d683f79ec55 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/64/10364/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index bf755b6..5ce5993 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,6 +9,7 @@ set -e +publish="$1" base="$PWD" deps="$base/deps" inst="$deps/install" -- To view, visit https://gerrit.osmocom.org/10364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic768a8e96e5e4d72acf3979da1412d683f79ec55 Gerrit-Change-Number: 10364 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 09:40:39 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 09:40:39 +0000 Subject: Change in simtrace2[master]: qmod: Add 'e' command for erasing the EEPROM In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/9858 ) Change subject: qmod: Add 'e' command for erasing the EEPROM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7cb0db568dd3e9d796829bf0019d63048612998 Gerrit-Change-Number: 9858 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Tue, 07 Aug 2018 09:40:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 09:41:00 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 09:41:00 +0000 Subject: Change in simtrace2[master]: qmod: Add 'e' command for erasing the EEPROM In-Reply-To: References: Message-ID: K?vin Redon has posted comments on this change. ( https://gerrit.osmocom.org/9858 ) Change subject: qmod: Add 'e' command for erasing the EEPROM ...................................................................... Patch Set 1: merging the code so I can fix it -- To view, visit https://gerrit.osmocom.org/9858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7cb0db568dd3e9d796829bf0019d63048612998 Gerrit-Change-Number: 9858 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon Gerrit-Comment-Date: Tue, 07 Aug 2018 09:41:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 10:00:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Aug 2018 10:00:25 +0000 Subject: Change in osmo-bsc[master]: GSCON: call api of a_reset.c with msc object directly In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10334 to look at the new patch set (#2). Change subject: GSCON: call api of a_reset.c with msc object directly ...................................................................... GSCON: call api of a_reset.c with msc object directly The API of a_reset.c is currently called with a pointer to struct reset_ctx. This puts the responsibility of checking the presence of msc->a.reset_fsm to the caller. It would be much more effective if the caller would check if msc->a.reset_fsm before dereferencing it. This also fixes at least one segfault that ocurrs when gscon_timer_cb() is called but no sccp connection is present yet. Therefore the pointer to bsc_msc_data would not be populated. This is now detected by a_reset.c itsself. - minor code cleanups - call a_reset.c functions with msc (struct bsc_msc_data) Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Related: OS#3447 --- M include/osmocom/bsc/a_reset.h M src/osmo-bsc/a_reset.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_sigtran.c 6 files changed, 54 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/10334/2 -- To view, visit https://gerrit.osmocom.org/10334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Gerrit-Change-Number: 10334 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 10:00:49 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 10:00:49 +0000 Subject: Change in simtrace2[master]: qmod: Add 'e' command for erasing the EEPROM In-Reply-To: References: Message-ID: K?vin Redon has submitted this change and it was merged. ( https://gerrit.osmocom.org/9858 ) Change subject: qmod: Add 'e' command for erasing the EEPROM ...................................................................... qmod: Add 'e' command for erasing the EEPROM Change-Id: Id7cb0db568dd3e9d796829bf0019d63048612998 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: K?vin Redon: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index 47a4cb6..acd090f 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -102,6 +102,26 @@ return 0; } +static int erase_hub_eeprom(void) +{ + int i; + + /* wait */ + mdelay(100); + + TRACE_INFO("Erasing EEPROM...\n\r"); + /* write the EEPROM once */ + for (i = 0; i < 256; i++) { + int rc = eeprom_write_byte(0x50, i, 0xff); + /* if the result was negative, repeat that write */ + if (rc < 0) + i--; + } + + return 0; +} + + static void board_exec_dbg_cmd_st12only(int ch) { uint32_t addr, val; @@ -114,6 +134,9 @@ case 'E': write_hub_eeprom(); break; + case 'e': + erase_hub_eeprom(); + break; case 'O': printf("Setting PRTPWR_OVERRIDE\n\r"); PIO_Set(&pin_hubpwr_override); @@ -161,6 +184,7 @@ printf("\tR\treset SAM3\n\r"); if (qmod_sam3_is_12()) { printf("\tE\tprogram EEPROM\n\r"); + printf("\te\tErase EEPROM\n\r"); printf("\tO\tEnable PRTPWR_OVERRIDE\n\r"); printf("\to\tDisable PRTPWR_OVERRIDE\n\r"); printf("\tH\tRelease HUB RESET (high)\n\r"); -- To view, visit https://gerrit.osmocom.org/9858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id7cb0db568dd3e9d796829bf0019d63048612998 Gerrit-Change-Number: 9858 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 10:06:15 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 10:06:15 +0000 Subject: Change in simtrace2[master]: USB: increase USB reset time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10360 to look at the new patch set (#2). Change subject: USB: increase USB reset time ...................................................................... USB: increase USB reset time USB reset can be signaled by pulling low USB D+ for at least 10 ms, according to the USB specification. This force a re-enumeration. This time is increased to 20 ms to work with more USB HUBs. Some SAM3S based board have external D+ pull-up mechanism (such as SIMtrace) which needs to be used to pull D+ low. This is a legacy mechanism from SAM7S history. This mechanism is not required anymore on the SAM3S, and the qmod does not use it. When the USB HAL is suspended, the transceiver is disabled, causing D+ and D- to be pulled low. Then the HAL is activated again. This is particularly required when DFU is started (and enumerated), and after flashing the SAM3S switched to the main application (without reset), so it can properly re-enumerate. This board difference is now defined on the board header. Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 --- M firmware/apps/dfu/main.c M firmware/libboard/common/include/board_common.h M firmware/libboard/simtrace/include/board.h M firmware/libcommon/source/usb.c 4 files changed, 23 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/60/10360/2 -- To view, visit https://gerrit.osmocom.org/10360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 Gerrit-Change-Number: 10360 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 10:14:29 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 10:14:29 +0000 Subject: Change in simtrace2[master]: qmod: error on EEPROM erase fail Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10365 Change subject: qmod: error on EEPROM erase fail ...................................................................... qmod: error on EEPROM erase fail repeating the EEPROM erase (byte write) in case of byte write failure could lead in an infinite log. log the error an return error code instead. Change-Id: Id6f3654d877ca772ba04237da91a6e86e3f441ec --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/65/10365/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index acd090f..bdc08f9 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -113,9 +113,11 @@ /* write the EEPROM once */ for (i = 0; i < 256; i++) { int rc = eeprom_write_byte(0x50, i, 0xff); - /* if the result was negative, repeat that write */ - if (rc < 0) - i--; + if (rc < 0) { + TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r", + i, __eeprom_bin[i]); + return 1; + } } return 0; -- To view, visit https://gerrit.osmocom.org/10365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id6f3654d877ca772ba04237da91a6e86e3f441ec Gerrit-Change-Number: 10365 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 10:31:27 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Aug 2018 10:31:27 +0000 Subject: Change in osmo-bsc[master]: GSCON: avoid sending connection oriented data when not connected In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10333 to look at the new patch set (#3). Change subject: GSCON: avoid sending connection oriented data when not connected ...................................................................... GSCON: avoid sending connection oriented data when not connected When no connection is present and had never existed, then conn->sccp.msc is unpopulated. However, there may be situations where osmo_bsc_sigtran_send() is executed while no connection is present. At the moment we assert on conn->sccp.msc, which would cause osmo-bsc to exit. In order to avoid this, better check conn->sccp.msc and drop the sccp message when the check is negative. - Remove assertion, add check. Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Related: OS#3446 --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/10333/3 -- To view, visit https://gerrit.osmocom.org/10333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Gerrit-Change-Number: 10333 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 10:31:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Aug 2018 10:31:28 +0000 Subject: Change in osmo-bsc[master]: sigtran: fix memleak in osmo_bsc_sigtran_send() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10366 Change subject: sigtran: fix memleak in osmo_bsc_sigtran_send() ...................................................................... sigtran: fix memleak in osmo_bsc_sigtran_send() The function osmo_bsc_sigtran_send() checks if the MSC is ready by calling a_reset_conn_ready(). If it is not ready it returns with -EINVAL. The msg message buffer is not freed, so we leak memory in those edge cases. - Make sure msg is freed when MSC is not ready. - Add a comment that osmo_bsc_sigtran_send() takes ownership of msg Change-Id: Ib1ff1d20e960a356bcee276b7c1bf9c93283e7af --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/10366/1 diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 449f1df..19d4817 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -338,7 +338,7 @@ return rc; } -/* Send data to MSC */ +/* Send data to MSC, the function will take ownership of *msg */ int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct osmo_ss7_instance *ss7; @@ -370,6 +370,7 @@ if (a_reset_conn_ready(msc->a.reset_fsm) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); + msgb_free(msg); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/10366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1ff1d20e960a356bcee276b7c1bf9c93283e7af Gerrit-Change-Number: 10366 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 11:24:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 7 Aug 2018 11:24:50 +0000 Subject: Change in osmo-msc[master]: mgcp: use codec information returned with ASSIGNMENT COMPL. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10367 Change subject: mgcp: use codec information returned with ASSIGNMENT COMPL. ...................................................................... mgcp: use codec information returned with ASSIGNMENT COMPL. When the assignment completes a choosen codec is returned. At the moment we do not use this information. - add struct members for codec info (both, RAN and CN) - parse codec info in BSSMAP ASSIGNMENT COMPLETE - use codec info on mgcp Since the MNCC API is not complete yet, we currently only use the codec info only on the internal MNCC yet. Change-Id: I9d5b1cd016d9a058b22a367d0e5e9f2ef447931a Related: OS#2728 --- M include/osmocom/msc/gsm_data.h M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_mgcp.c 4 files changed, 76 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/67/10367/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 73047ee..c9584e1 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -143,10 +143,13 @@ char local_addr_ran[INET_ADDRSTRLEN]; uint16_t remote_port_ran; char remote_addr_ran[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_ran; + uint16_t local_port_cn; char local_addr_cn[INET_ADDRSTRLEN]; uint16_t remote_port_cn; char remote_addr_cn[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_cn; } rtp; /* which Iu-CS connection, if any. */ diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 1ace43d..11d3673 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -502,11 +502,50 @@ return 0; } +/* Use the speech codec info we go with the assignment complete to dtermine + * which codec we will signal to the MGW */ +static enum mgcp_codecs mgcp_codec_from_sc(struct gsm0808_speech_codec *sc) +{ + switch (sc->type) { + case GSM0808_SCT_FR1: + return CODEC_GSM_8000_1; + break; + case GSM0808_SCT_FR2: + return CODEC_GSMEFR_8000_1; + break; + case GSM0808_SCT_FR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_FR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_FR5: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR1: + return CODEC_GSMHR_8000_1; + break; + case GSM0808_SCT_HR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_HR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR6: + return CODEC_AMRWB_16000_1; + break; + default: + return CODEC_PCMU_8000_1; + break; + } +} + /* Endpoint to handle assignment complete */ static int bssmap_rx_ass_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, struct tlv_parsed *tp) { struct sockaddr_storage rtp_addr; + struct gsm0808_speech_codec sc; struct sockaddr_in *rtp_addr_in; int rc; @@ -525,6 +564,15 @@ return -EINVAL; } + /* Decode speech codec (choosen) element */ + rc = gsm0808_dec_speech_codec(&sc, TLVP_VAL(tp, GSM0808_IE_SPEECH_CODEC), + TLVP_LEN(tp, GSM0808_IE_SPEECH_CODEC)); + if (rc < 0) { + LOGPCONN(conn, LOGL_ERROR, "Unable to decode speech codec (choosen).\n"); + return -EINVAL; + } + conn->rtp.codec_ran = mgcp_codec_from_sc(&sc); + /* use address / port supplied with the AoIP * transport address element */ if (rtp_addr.ss_family == AF_INET) { diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 8becd05..2c17e22 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -319,6 +319,15 @@ /* Which subscriber do we want to track trans1 or trans2? */ log_set_context(LOG_CTX_VLR_SUBSCR, trans1->vsub); + /* This call briding mechanism is only used with the internal MNCC. + * functionality (with external MNCC briding would be done by the PBX) + * This means we may just copy the codec info we have for the RAN side + * of the first leg to the CN side of both legs. This also means that + * if both legs use different codecs the MGW must perform transcoding + * on the second leg. */ + trans1->conn->rtp.codec_cn = trans1->conn->rtp.codec_ran; + trans2->conn->rtp.codec_cn = trans1->conn->rtp.codec_ran; + /* Bridge RTP streams */ rc = msc_mgcp_call_complete(trans1, trans2->conn->rtp.local_port_cn, trans2->conn->rtp.local_addr_cn); @@ -1716,6 +1725,16 @@ struct gsm_mncc_rtp *rtp = arg; struct in_addr addr; + /* FIXME: in *rtp we should get the codec information of the remote + * leg. We will have to populate trans->conn->rtp.codec_cn with a + * meaningful value based on this information but unfortunately we + * can't do that yet because the mncc API can not signal dynamic + * payload types yet. This must be fixed first. Also there may be + * additional members necessary in trans->conn->rtp because we + * somehow need to deal with dynamic payload types that do not + * comply to 3gpp's assumptions of payload type numbers on the A + * interface. See also related tickets: OS#3399 and OS1683 */ + /* Find callref */ trans = trans_find_by_callref(net, rtp->callref); if (!trans) { diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index f5bdeb7..e58b249 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -277,22 +277,16 @@ struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; - -#ifdef BUILD_IU struct gsm_trans *trans; struct gsm_subscriber_connection *conn; -#endif OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); - -#ifdef BUILD_IU trans = mgcp_ctx->trans; OSMO_ASSERT(trans); conn = trans->conn; OSMO_ASSERT(conn); -#endif /* NOTE: In case of error, we will not be able to perform any DLCX * operation because until this point we do not have requested any @@ -396,22 +390,16 @@ struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; - -#ifdef BUILD_IU struct gsm_trans *trans; struct gsm_subscriber_connection *conn; -#endif OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); - -#ifdef BUILD_IU trans = mgcp_ctx->trans; OSMO_ASSERT(trans); conn = trans->conn; OSMO_ASSERT(conn); -#endif switch (event) { case EV_CRCX_RAN_RESP: @@ -593,7 +581,9 @@ .conn_id = mgcp_ctx->conn_id_cn, .conn_mode = MGCP_CONN_RECV_SEND, .audio_ip = conn->rtp.remote_addr_cn, - .audio_port = conn->rtp.remote_port_cn + .audio_port = conn->rtp.remote_port_cn, + .codecs[0] = conn->rtp.codec_cn, + .codecs_len = 1 }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { @@ -710,7 +700,9 @@ .conn_id = mgcp_ctx->conn_id_ran, .conn_mode = MGCP_CONN_RECV_SEND, .audio_ip = conn->rtp.remote_addr_ran, - .audio_port = conn->rtp.remote_port_ran + .audio_port = conn->rtp.remote_port_ran, + .codecs[0] = conn->rtp.codec_ran, + .codecs_len = 1 }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { -- To view, visit https://gerrit.osmocom.org/10367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9d5b1cd016d9a058b22a367d0e5e9f2ef447931a Gerrit-Change-Number: 10367 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:10:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:10:27 +0000 Subject: Change in osmo-bsc[master]: GSCON: avoid sending connection oriented data when not connected In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10333 ) Change subject: GSCON: avoid sending connection oriented data when not connected ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Gerrit-Change-Number: 10333 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 15:10:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:10:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:10:38 +0000 Subject: Change in osmo-bsc[master]: sigtran: fix memleak in osmo_bsc_sigtran_send() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10366 ) Change subject: sigtran: fix memleak in osmo_bsc_sigtran_send() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1ff1d20e960a356bcee276b7c1bf9c93283e7af Gerrit-Change-Number: 10366 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 15:10:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:10:44 +0000 Subject: Change in osmo-bsc[master]: sigtran: fix memleak in osmo_bsc_sigtran_send() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10366 ) Change subject: sigtran: fix memleak in osmo_bsc_sigtran_send() ...................................................................... sigtran: fix memleak in osmo_bsc_sigtran_send() The function osmo_bsc_sigtran_send() checks if the MSC is ready by calling a_reset_conn_ready(). If it is not ready it returns with -EINVAL. The msg message buffer is not freed, so we leak memory in those edge cases. - Make sure msg is freed when MSC is not ready. - Add a comment that osmo_bsc_sigtran_send() takes ownership of msg Change-Id: Ib1ff1d20e960a356bcee276b7c1bf9c93283e7af --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 449f1df..19d4817 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -338,7 +338,7 @@ return rc; } -/* Send data to MSC */ +/* Send data to MSC, the function will take ownership of *msg */ int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct osmo_ss7_instance *ss7; @@ -370,6 +370,7 @@ if (a_reset_conn_ready(msc->a.reset_fsm) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); + msgb_free(msg); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/10366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1ff1d20e960a356bcee276b7c1bf9c93283e7af Gerrit-Change-Number: 10366 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:10:44 +0000 Subject: Change in osmo-bsc[master]: GSCON: avoid sending connection oriented data when not connected In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10333 ) Change subject: GSCON: avoid sending connection oriented data when not connected ...................................................................... GSCON: avoid sending connection oriented data when not connected When no connection is present and had never existed, then conn->sccp.msc is unpopulated. However, there may be situations where osmo_bsc_sigtran_send() is executed while no connection is present. At the moment we assert on conn->sccp.msc, which would cause osmo-bsc to exit. In order to avoid this, better check conn->sccp.msc and drop the sccp message when the check is negative. - Remove assertion, add check. Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Related: OS#3446 --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 19d4817..b97d51b 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -348,7 +348,12 @@ OSMO_ASSERT(conn); OSMO_ASSERT(msg); - OSMO_ASSERT(conn->sccp.msc); + + if (!conn->sccp.msc) { + LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); + msgb_free(msg); + return -EINVAL; + } msc = conn->sccp.msc; -- To view, visit https://gerrit.osmocom.org/10333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4eaa983702224e5995a388ea9890ee04212eb569 Gerrit-Change-Number: 10333 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:11:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:11:40 +0000 Subject: Change in osmo-bsc[master]: GSCON: call api of a_reset.c with msc object directly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10334 ) Change subject: GSCON: call api of a_reset.c with msc object directly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Gerrit-Change-Number: 10334 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 15:11:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:11:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:11:41 +0000 Subject: Change in osmo-bsc[master]: GSCON: call api of a_reset.c with msc object directly In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10334 ) Change subject: GSCON: call api of a_reset.c with msc object directly ...................................................................... GSCON: call api of a_reset.c with msc object directly The API of a_reset.c is currently called with a pointer to struct reset_ctx. This puts the responsibility of checking the presence of msc->a.reset_fsm to the caller. It would be much more effective if the caller would check if msc->a.reset_fsm before dereferencing it. This also fixes at least one segfault that ocurrs when gscon_timer_cb() is called but no sccp connection is present yet. Therefore the pointer to bsc_msc_data would not be populated. This is now detected by a_reset.c itsself. - minor code cleanups - call a_reset.c functions with msc (struct bsc_msc_data) Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Related: OS#3447 --- M include/osmocom/bsc/a_reset.h M src/osmo-bsc/a_reset.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_sigtran.c 6 files changed, 54 insertions(+), 39 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/a_reset.h b/include/osmocom/bsc/a_reset.h index 6b6ce81..a09972e 100644 --- a/include/osmocom/bsc/a_reset.h +++ b/include/osmocom/bsc/a_reset.h @@ -20,17 +20,19 @@ #pragma once +struct bsc_msc_data; + /* Create and start state machine which handles the reset/reset-ack procedure */ -struct osmo_fsm_inst *a_reset_alloc(void *ctx, const char *name, void *cb, void *priv); +void a_reset_alloc(struct bsc_msc_data *msc, const char *name, void *cb); /* Confirm that we sucessfully received a reset acknowlege message */ -void a_reset_ack_confirm(struct osmo_fsm_inst *reset_fsm); +void a_reset_ack_confirm(struct bsc_msc_data *msc); /* Report a failed connection */ -void a_reset_conn_fail(struct osmo_fsm_inst *reset_fsm); +void a_reset_conn_fail(struct bsc_msc_data *msc); /* Report a successful connection */ -void a_reset_conn_success(struct osmo_fsm_inst *reset_fsm); +void a_reset_conn_success(struct bsc_msc_data *msc); /* Check if we have a connection to a specified msc */ -bool a_reset_conn_ready(struct osmo_fsm_inst *reset_fsm); +bool a_reset_conn_ready(struct bsc_msc_data *msc); diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index b8f8c8c..3c21142 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -137,68 +137,83 @@ }; /* Create and start state machine which handles the reset/reset-ack procedure */ -struct osmo_fsm_inst *a_reset_alloc(void *ctx, const char *name, void *cb, void *priv) +void a_reset_alloc(struct bsc_msc_data *msc, const char *name, void *cb) { - OSMO_ASSERT(name); - struct reset_ctx *reset_ctx; struct osmo_fsm_inst *reset_fsm; + OSMO_ASSERT(msc); + OSMO_ASSERT(name); + OSMO_ASSERT(cb); + + /* There must not be any double allocation! */ + OSMO_ASSERT(msc->a.reset_fsm == NULL); + /* Register the fsm description (if not already done) */ if (osmo_fsm_find_by_name(fsm.name) != &fsm) osmo_fsm_register(&fsm); /* Allocate and configure a new fsm instance */ - reset_ctx = talloc_zero(ctx, struct reset_ctx); + reset_ctx = talloc_zero(msc, struct reset_ctx); OSMO_ASSERT(reset_ctx); - reset_ctx->priv = priv; + reset_ctx->priv = msc; reset_ctx->cb = cb; reset_ctx->conn_loss_counter = 0; - reset_fsm = osmo_fsm_inst_alloc(&fsm, ctx, reset_ctx, LOGL_DEBUG, name); + reset_fsm = osmo_fsm_inst_alloc(&fsm, msc, reset_ctx, LOGL_DEBUG, name); OSMO_ASSERT(reset_fsm); /* kick off reset-ack sending mechanism */ osmo_fsm_inst_state_chg(reset_fsm, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); - return reset_fsm; + msc->a.reset_fsm = reset_fsm; } /* Confirm that we sucessfully received a reset acknowlege message */ -void a_reset_ack_confirm(struct osmo_fsm_inst *reset_fsm) +void a_reset_ack_confirm(struct bsc_msc_data *msc) { - OSMO_ASSERT(reset_fsm); - osmo_fsm_inst_dispatch(reset_fsm, EV_RESET_ACK, NULL); + if (!msc) + return; + + if (!msc->a.reset_fsm) + return; + + osmo_fsm_inst_dispatch(msc->a.reset_fsm, EV_RESET_ACK, NULL); } /* Report a failed connection */ -void a_reset_conn_fail(struct osmo_fsm_inst *reset_fsm) +void a_reset_conn_fail(struct bsc_msc_data *msc) { - /* If no reset context is supplied, just drop the info */ - if (!reset_fsm) + if (!msc) return; - osmo_fsm_inst_dispatch(reset_fsm, EV_N_DISCONNECT, NULL); + if (!msc->a.reset_fsm) + return; + + osmo_fsm_inst_dispatch(msc->a.reset_fsm, EV_N_DISCONNECT, NULL); } /* Report a successful connection */ -void a_reset_conn_success(struct osmo_fsm_inst *reset_fsm) +void a_reset_conn_success(struct bsc_msc_data *msc) { - /* If no reset context is supplied, just drop the info */ - if (!reset_fsm) + if (!msc) return; - osmo_fsm_inst_dispatch(reset_fsm, EV_N_CONNECT, NULL); + if (!msc->a.reset_fsm) + return; + + osmo_fsm_inst_dispatch(msc->a.reset_fsm, EV_N_CONNECT, NULL); } /* Check if we have a connection to a specified msc */ -bool a_reset_conn_ready(struct osmo_fsm_inst *reset_fsm) +bool a_reset_conn_ready(struct bsc_msc_data *msc) { - /* If no reset context is supplied, we assume that - * the connection can't be ready! */ - if (!reset_fsm) + if (!msc) return false; - if (reset_fsm->state == ST_CONN) + if (!msc->a.reset_fsm) + return false; + + if (msc->a.reset_fsm->state == ST_CONN) return true; return false; diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 81fe9f6..32375d4 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -771,7 +771,7 @@ * could indicate a bad SCCP connection. We now inform the the * FSM that controls the BSSMAP reset about the event. Maybe * a BSSMAP reset is necessary. */ - a_reset_conn_fail(conn->sccp.msc->a.reset_fsm); + a_reset_conn_fail(conn->sccp.msc); /* Since we could not reach the MSC, we give up and terminate * the FSM instance now (N-DISCONNET.req is sent in @@ -783,7 +783,7 @@ * disconnected. */ LOGPFSML(fi, LOGL_ERROR, "Long after a BSSMAP Clear Command, the conn is still not" " released. For sanity, discarding this conn now.\n"); - a_reset_conn_fail(conn->sccp.msc->a.reset_fsm); + a_reset_conn_fail(conn->sccp.msc); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); break; default: diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index d1a6a96..0d7cdf0 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -48,7 +48,7 @@ return false; /* Reset procedure not (yet) executed */ - if (a_reset_conn_ready(conn->sccp.msc->a.reset_fsm) == false) + if (a_reset_conn_ready(conn->sccp.msc) == false) return false; return true; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 95bad7b..c067dd3 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -59,7 +59,7 @@ /* Inform the FSM that controls the RESET/RESET-ACK procedure * that we have successfully received the reset-ack message */ - a_reset_ack_confirm(msc->a.reset_fsm); + a_reset_ack_confirm(msc); return 0; } diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index b97d51b..7e5f5f6 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -240,7 +240,7 @@ /* Incoming data is a sign of a vital connection */ conn = get_bsc_conn_by_conn_id(scu_prim->u.data.conn_id); if (conn) { - a_reset_conn_success(conn->sccp.msc->a.reset_fsm); + a_reset_conn_success(conn->sccp.msc); handle_data_from_msc(conn, oph->msg); } break; @@ -284,7 +284,7 @@ LOGP(DMSC, LOGL_NOTICE, "Initializing resources for new SIGTRAN connection to MSC: %s...\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr)); - if (a_reset_conn_ready(msc->a.reset_fsm) == false) { + if (a_reset_conn_ready(msc) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); return BSC_CON_REJECT_NO_LINK; } @@ -314,7 +314,7 @@ msc = conn->sccp.msc; - if (a_reset_conn_ready(msc->a.reset_fsm) == false) { + if (a_reset_conn_ready(msc) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); return -EINVAL; } @@ -373,7 +373,7 @@ } else LOGP(DMSC, LOGL_ERROR, "Tx MSC (message too short)\n"); - if (a_reset_conn_ready(msc->a.reset_fsm) == false) { + if (a_reset_conn_ready(msc) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); msgb_free(msg); return -EINVAL; @@ -532,9 +532,7 @@ return -EINVAL; /* Start MSC-Reset procedure */ - msc->a.reset_fsm = a_reset_alloc(msc, msc_name, osmo_bsc_sigtran_reset_cb, msc); - if (!msc->a.reset_fsm) - return -EINVAL; + a_reset_alloc(msc, msc_name, osmo_bsc_sigtran_reset_cb); /* If we have detected that the SS7 configuration of the MSC we have just initalized * was incomplete or completely missing, we can not tolerate another incomplete -- To view, visit https://gerrit.osmocom.org/10334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0802aaadf0af4e58e41c98999e8c6823838adb61 Gerrit-Change-Number: 10334 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:12:56 +0000 Subject: Change in simtrace2[master]: USB: increase USB reset time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10360 ) Change subject: USB: increase USB reset time ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 Gerrit-Change-Number: 10360 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 15:12:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:13:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:13:02 +0000 Subject: Change in simtrace2[master]: jenkins: fix publish In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10364 ) Change subject: jenkins: fix publish ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic768a8e96e5e4d72acf3979da1412d683f79ec55 Gerrit-Change-Number: 10364 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 15:13:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:14:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:14:41 +0000 Subject: Change in simtrace2[master]: qmod: error on EEPROM erase fail In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by K?vin Redon. ( https://gerrit.osmocom.org/10365 ) Change subject: qmod: error on EEPROM erase fail ...................................................................... qmod: error on EEPROM erase fail repeating the EEPROM erase (byte write) in case of byte write failure could lead in an infinite loop. log the error an return error code instead. Change-Id: Id6f3654d877ca772ba04237da91a6e86e3f441ec --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/65/10365/2 -- To view, visit https://gerrit.osmocom.org/10365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id6f3654d877ca772ba04237da91a6e86e3f441ec Gerrit-Change-Number: 10365 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:14:44 +0000 Subject: Change in simtrace2[master]: qmod: error on EEPROM erase fail In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10365 ) Change subject: qmod: error on EEPROM erase fail ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6f3654d877ca772ba04237da91a6e86e3f441ec Gerrit-Change-Number: 10365 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 15:14:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:14:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:14:45 +0000 Subject: Change in simtrace2[master]: USB: increase USB reset time In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10360 ) Change subject: USB: increase USB reset time ...................................................................... USB: increase USB reset time USB reset can be signaled by pulling low USB D+ for at least 10 ms, according to the USB specification. This force a re-enumeration. This time is increased to 20 ms to work with more USB HUBs. Some SAM3S based board have external D+ pull-up mechanism (such as SIMtrace) which needs to be used to pull D+ low. This is a legacy mechanism from SAM7S history. This mechanism is not required anymore on the SAM3S, and the qmod does not use it. When the USB HAL is suspended, the transceiver is disabled, causing D+ and D- to be pulled low. Then the HAL is activated again. This is particularly required when DFU is started (and enumerated), and after flashing the SAM3S switched to the main application (without reset), so it can properly re-enumerate. This board difference is now defined on the board header. Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 --- M firmware/apps/dfu/main.c M firmware/libboard/common/include/board_common.h M firmware/libboard/simtrace/include/board.h M firmware/libcommon/source/usb.c 4 files changed, 23 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 74268ad..7f8fbfc 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -22,6 +22,7 @@ #include "usb/device/dfu/dfu.h" #include "usb/common/dfu/usb_dfu.h" #include "manifest.h" +#include "USBD_HAL.h" #include @@ -294,11 +295,18 @@ TRACE_INFO("USB init...\n\r"); /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ +#ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; PIO_Configure(&usb_dp_pullup, 1); PIO_Set(&usb_dp_pullup); - mdelay(15); +#endif + USBD_HAL_Suspend(); + mdelay(20); +#ifdef PIN_USB_PULLUP PIO_Clear(&usb_dp_pullup); +#endif + USBD_HAL_Activate(); + USBDFU_Initialize(&dfu_descriptors); while (USBD_GetState() < USBD_STATE_CONFIGURED) { diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 06d3d6a..1b29680 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -114,15 +114,8 @@ #define SIM_PWEN PIO_PA5 #define VCC_FWD PIO_PA26 -/** Pin configuration to control USB pull-up on D+ - * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high - */ -#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} - // Board has UDP controller #define BOARD_USB_UDP -// D+ has external pull-up -#define BOARD_USB_PULLUP_EXTERNAL #define BOARD_USB_DFU #define BOARD_DFU_BOOT_SIZE (16 * 1024) diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index db3a925..6751863 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -117,6 +117,11 @@ /* SPI flash write protect pin (active low, pulled low) */ #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} +/** Pin configuration to control USB pull-up on D+ + * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high + */ +#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} + /** USB definitions */ /* OpenMoko SIMtrace 2 USB vendor ID */ #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index e929a05..43c7bb2 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -2,6 +2,7 @@ * ATMEL Microcontroller Software Support * ---------------------------------------------------------------------------- * Copyright (c) 2009, Atmel Corporation + * Copyright (c) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon * * All rights reserved. * @@ -35,6 +36,7 @@ #include "simtrace.h" #include "simtrace_usb.h" #include "utils.h" +#include "USBD_HAL.h" #include #include @@ -576,11 +578,17 @@ { /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ +#ifdef PIN_USB_PULLUP const Pin usb_dp_pullup = PIN_USB_PULLUP; PIO_Configure(&usb_dp_pullup, 1); PIO_Set(&usb_dp_pullup); - mdelay(15); +#endif + USBD_HAL_Suspend(); + mdelay(20); +#ifdef PIN_USB_PULLUP PIO_Clear(&usb_dp_pullup); +#endif + USBD_HAL_Activate(); // Get std USB driver USBDDriver *pUsbd = USBD_GetDriver(); -- To view, visit https://gerrit.osmocom.org/10360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b58d8101c2fcf5595026b675728826af26127a3 Gerrit-Change-Number: 10360 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:14:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:14:45 +0000 Subject: Change in simtrace2[master]: jenkins: fix publish In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10364 ) Change subject: jenkins: fix publish ...................................................................... jenkins: fix publish the script argument was not saved in the publish variable used later to decide if publishing/uploading is needed. Change-Id: Ic768a8e96e5e4d72acf3979da1412d683f79ec55 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index bf755b6..5ce5993 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,6 +9,7 @@ set -e +publish="$1" base="$PWD" deps="$base/deps" inst="$deps/install" -- To view, visit https://gerrit.osmocom.org/10364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic768a8e96e5e4d72acf3979da1412d683f79ec55 Gerrit-Change-Number: 10364 Gerrit-PatchSet: 3 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:14:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 15:14:46 +0000 Subject: Change in simtrace2[master]: qmod: error on EEPROM erase fail In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10365 ) Change subject: qmod: error on EEPROM erase fail ...................................................................... qmod: error on EEPROM erase fail repeating the EEPROM erase (byte write) in case of byte write failure could lead in an infinite loop. log the error an return error code instead. Change-Id: Id6f3654d877ca772ba04237da91a6e86e3f441ec --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index acd090f..bdc08f9 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -113,9 +113,11 @@ /* write the EEPROM once */ for (i = 0; i < 256; i++) { int rc = eeprom_write_byte(0x50, i, 0xff); - /* if the result was negative, repeat that write */ - if (rc < 0) - i--; + if (rc < 0) { + TRACE_ERROR("Erasing EEPROM failed at byte %u: 0x%02x\n\r", + i, __eeprom_bin[i]); + return 1; + } } return 0; -- To view, visit https://gerrit.osmocom.org/10365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id6f3654d877ca772ba04237da91a6e86e3f441ec Gerrit-Change-Number: 10365 Gerrit-PatchSet: 2 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 7 15:17:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 7 Aug 2018 15:17:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#73?= Message-ID: <1652610927.110.1533655025404.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [K?vin Redon] USB: increase USB reset time [K?vin Redon] jenkins: fix publish [laforge] qmod: error on EEPROM erase fail ------------------------------------------ [...truncated 151.17 KB...] 1368 1 0 1369 559 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3400 0 208 3608 e18 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2619 12 4 2635 a4b obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2304 1152 0 3456 d80 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 351 0 520 871 367 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 25556 0 17988 43544 aa18 bin/owhw-cardem-dfu.elf rm -fR obj/owhw/*.o bin/*.bin bin/*.elf bin/*.elf.txt bin/*.map bin/*.lst `find . -name \*.p` =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:21:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:21:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:214:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:21:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:595:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:388:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:88:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -losmocore -losmosim cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -losmocore cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -losmocore cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -losmocore =============== UPLOAD BUILD ============== cp: cannot stat 'firmware/bin/*.bin': No such file or directory Build step 'Execute shell' marked build as failure $ ssh-agent -k unset SSH_AUTH_SOCK; unset SSH_AGENT_PID; echo Agent pid 9018 killed; [ssh-agent] Stopped. [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Aug 7 15:51:57 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 15:51:57 +0000 Subject: Change in simtrace2[master]: jenkins: clean after upload Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10368 Change subject: jenkins: clean after upload ...................................................................... jenkins: clean after upload the upload failed because after the firmware were built (make), they where removed (make clean). now they are removed only after the upload. Change-Id: Ie4421a6fa9207eb541107de9c14f265626f6be96 --- M contrib/jenkins.sh 1 file changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/68/10368/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5ce5993..bdf2b39 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,6 @@ echo echo "=============== $board / $app START ==============" make BOARD="$board" APP="$app" - make BOARD="$board" APP="$app" clean echo "=============== $board / $app RES:$? ==============" done @@ -56,19 +55,25 @@ make clean if [ "x$publish" = "x--publish" ]; then - echo - echo "=============== UPLOAD BUILD ==============" - mkdir out/ - cp firmware/bin/*.bin out/ + echo + echo "=============== UPLOAD BUILD ==============" - cat > "$WORKSPACE/known_hosts" < "$WORKSPACE/known_hosts" < -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:18:41 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 7 Aug 2018 16:18:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Call f_bssap_start in TC_cr_before_reset Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10369 Change subject: Call f_bssap_start in TC_cr_before_reset ...................................................................... Call f_bssap_start in TC_cr_before_reset This function starts the SCCP component which will relay the BSSAP messages to/from port SCCP_SP_PORT which is connected to BSSAP_DIRECT. Ticket: OS#3286 Change-Id: Icee085d5fe610061c85d7fe7cf62cbccd8cfa556 --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/10369/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index df1d1c2..f70edd0 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1765,6 +1765,8 @@ var boolean reset_ack_seen := false; f_init_bssap_direct(); + f_bssap_start(g_bssap[0]); + /* Make a blind connection attemt, to trigger the deadlock condition */ BSSAP_DIRECT.send(ts_BSSAP_CONNECT_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, 1, omit)); -- To view, visit https://gerrit.osmocom.org/10369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icee085d5fe610061c85d7fe7cf62cbccd8cfa556 Gerrit-Change-Number: 10369 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:22:49 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 16:22:49 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10370 Change subject: vty: add cmd "reset sgsn state" ...................................................................... vty: add cmd "reset sgsn state" Reset the SGSN internal state. Useful when testing the SGSN via TTCN3. Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 --- M src/gprs/sgsn_vty.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/70/10370/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 8092158..c48d55c 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,8 @@ #include #include +#include + #include #include @@ -796,6 +799,34 @@ vty_out(vty, " Use count: %u%s", gsub->use_count, VTY_NEWLINE); } +DEFUN(reset_sgsn_state, + reset_sgsn_state_cmd, + "reset sgsn state", + "Remove all known subscriber, MM ctx and flush BSSGP queues Useful when running tests against the SGSN") +{ + struct gprs_subscr *subscr, *tmp_subscr; + struct sgsn_mm_ctx *mm, *tmp_mm; + + llist_for_each_entry_safe(mm, tmp_mm, &sgsn_mm_ctxts, list) + { + gsm0408_gprs_access_cancelled(mm, SGSN_ERROR_CAUSE_NONE); + } + vty_out(vty, "Cancelled MM Ctx. %s", VTY_NEWLINE); + + llist_for_each_entry_safe(subscr, tmp_subscr, gprs_subscribers, entry) { + gprs_subscr_get(subscr); + gprs_subscr_cancel(subscr); + gprs_subscr_put(subscr); + } + vty_out(vty, "Removed all gprs subscribers.%s", VTY_NEWLINE); + + bssgp_flush_all_queues(); + vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE); + + /* remove all queues to bssgp */ + return CMD_SUCCESS; +} + DEFUN(show_subscr_cache, show_subscr_cache_cmd, "show subscriber cache", @@ -1310,6 +1341,7 @@ install_element(ENABLE_NODE, &update_subscr_cancel_cmd); install_element(ENABLE_NODE, &update_subscr_update_location_result_cmd); install_element(ENABLE_NODE, &update_subscr_update_auth_info_cmd); + install_element(ENABLE_NODE, &reset_sgsn_state_cmd); install_element(CONFIG_NODE, &cfg_sgsn_cmd); install_node(&sgsn_node, config_write_sgsn); -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 16:25:06 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10371 Change subject: bssgp: introduce flush queue functions ...................................................................... bssgp: introduce flush queue functions To reset the state of BSSGP allow to flush the BSSGP queues. Introduce the functions: bssgp_fc_flush_queue() bssgp_flush_all_queues() Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/libosmogb.map 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/10371/1 diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h index 2dead69..400c3e0 100644 --- a/include/osmocom/gprs/gprs_bssgp.h +++ b/include/osmocom/gprs/gprs_bssgp.h @@ -207,6 +207,9 @@ int bssgp_fc_ms_init(struct bssgp_flow_control *fc_ms, uint16_t bvci, uint16_t nsei, uint32_t max_queue_depth); +void bssgp_flush_all_queues(); +void bssgp_fc_flush_queue(struct bssgp_flow_control *fc); + /* gprs_bssgp_vty.c */ int bssgp_vty_init(void); void bssgp_set_log_ss(int ss); diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 5dfce16..fb79cf8 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1263,3 +1263,23 @@ { DBSSGP = ss; } + +void bssgp_fc_flush_queue(struct bssgp_flow_control *fc) +{ + struct bssgp_fc_queue_element *element, *tmp; + llist_for_each_entry_safe(element, tmp, &fc->queue, list) { + msgb_free(element->msg); + llist_del(element); + talloc_free(element); + } +} + +void bssgp_flush_all_queues() +{ + struct bssgp_bvc_ctx *bctx; + + llist_for_each_entry(bctx, &bssgp_bvc_ctxts, list) { + if (bctx->fc) + bssgp_fc_flush_queue(bctx->fc); + } +} diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index d56e651..ec69670 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -6,6 +6,8 @@ bssgp_fc_in; bssgp_fc_init; bssgp_fc_ms_init; +bssgp_fc_flush_queue; +bssgp_flush_all_queues; bssgp_msgb_alloc; bssgp_msgb_copy; bssgp_msgb_tlli_put; -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:26:47 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 16:26:47 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10370 ) Change subject: vty: add cmd "reset sgsn state" ...................................................................... Patch Set 1: depends on https://gerrit.osmocom.org/#/c/libosmocore/+/10371/ -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 07 Aug 2018 16:26:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:29:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 7 Aug 2018 16:29:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10372 Change subject: add DTX fill frame BTS tests ...................................................................... add DTX fill frame BTS tests Add tests TC_tch_sign_l2_fill_frame and TC_tch_sign_l2_fill_frame_dtxd. TC_tch_sign_l2_fill_frame is already passing and verifies that fill frames are sent if there is nothing else to transmit on a TCHF signalling channel where DTX is disabled for downstream. TC_tch_sign_l2_fill_frame_dtxd is currently failing. It verifies that only specific fill frames are sent, as required by GSM 05.08 for TCHF signalling channels with DTX enabled for downstream. At present, our implementation generates no fill frames in this case, which is one piece of the problem described in issue OS#1950. Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Related: OS#1950 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml 2 files changed, 101 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/10372/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fb6137c..8ff2d35 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3794,6 +3794,97 @@ f_assert_lapdm('03e00d063505'O, tr_LAPDm_I(0, true, false, 7, 0, '063505'O), "I/7/0"); } +/*********************************************************************** + * DTX Related (see GSM 05.08, section 8.3) + ***********************************************************************/ + + function f_test_l2_fill_frames(boolean dtxd, integer num_fill_frames_expected, float wait_time) runs on ConnHdlr { + var L1ctlDlMessage dl; + var octetstring l2_fill_frame := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O; + var integer nframes := 0; + /* Frames numbers (mod 104) for which a fill frame is expected on TCHF if DTX is enabled. */ + var Integers required_tdma_frames_dtx_tchf := { 52, 53, 54, 55, 56, 57, 58, 59 }; + timer T := wait_time; + + f_l1_tune(L1CTL); + RSL.clear; + L1CTL.clear; + + /* activate TCHF signalling channel */ + f_est_dchan(false); + + T.start; + alt { + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var octetstring l2 := dl.payload.data_ind.payload; + if (not match(l2, l2_fill_frame)) { + repeat; + } + nframes := nframes + 1; + + if (dtxd) { + var GsmFrameNumber frame_number := dl.dl_info.frame_nr; + for (var integer i := 0; i < lengthof(required_tdma_frames_dtx_tchf); i := i + 1) { + if (frame_number mod 104 == required_tdma_frames_dtx_tchf[i]) { + if (nframes >= num_fill_frames_expected) { + T.stop; + setverdict(pass); + } + repeat; + } + } + log("Received DTX TCH fill frame with bad frame number: ", frame_number); + setverdict(fail, "Unexpected L2 fill frame received on Um"); + } else if (nframes >= num_fill_frames_expected) { + T.stop; + setverdict(pass); + } else { + repeat; + } + } + [] L1CTL.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for L2 fill frames on Um"); + mtc.stop; + } + } +} + +function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr { + /* Expect 104 L2 fill frames to show up on the Um interface within 2.5 seconds. */ + f_test_l2_fill_frames(false, 104, 2.5); +} + +function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr { + /* With DTX enabled there are 8 TDMA fill frames per every 104 frames. + * Expect at least 8 L2 fill frames (out of 104 TDMA frames) on the Um interface within 2.5 seconds. */ + f_test_l2_fill_frames(true, 8, 2.5); +} + +function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN(dtxd))); + pars.t_guard := 60.0; + f_init(testcasename()); + if (dtxd) { + vc_conn := f_start_handler(refers(f_TC_tch_sign_l2_fill_frame_dtxd), pars); + } else { + vc_conn := f_start_handler(refers(f_TC_tch_sign_l2_fill_frame), pars); + } + vc_conn.done; +} + +/* Verify that L2 fill frames are sent on TCH in signaling mode if + * there is nothing to transmit while DTX is disabled on downlink. */ +testcase TC_tch_sign_l2_fill_frame() runs on test_CT { + f_tch_sign_l2_fill_frame(false); +} + +/* Verify that particular L2 fill frames are sent on TCH in signaling mode if + * there is nothing to transmit while DTX is enabled on downlink. */ +testcase TC_tch_sign_l2_fill_frame_dtxd() runs on test_CT { + f_tch_sign_l2_fill_frame(true); +} /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ @@ -3926,6 +4017,9 @@ execute( TC_encr_cmd_a53() ); execute( TC_lapdm_selftest() ); + + execute( TC_tch_sign_l2_fill_frame() ); + execute( TC_tch_sign_l2_fill_frame_dtxd() ); } diff --git a/bts/expected-results.xml b/bts/expected-results.xml index d1a65a3..b8f0d68 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -85,4 +85,11 @@ + + + "Timeout waiting for L2 fill frames on Um" + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_tch_sign_l2_fill_frame_dtxd testcase + + -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:32:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 7 Aug 2018 16:32:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10372 to look at the new patch set (#2). Change subject: add DTX fill frame BTS tests ...................................................................... add DTX fill frame BTS tests Add tests TC_tch_sign_l2_fill_frame and TC_tch_sign_l2_fill_frame_dtxd. TC_tch_sign_l2_fill_frame is already passing and verifies that fill frames are sent if there is nothing else to transmit on a TCHF signalling channel where DTX is disabled for downstream. TC_tch_sign_l2_fill_frame_dtxd is currently failing. It verifies that only specific fill frames are sent, as required by GSM 05.08 for TCHF signalling channels with DTX enabled for downstream. At present, our implementation generates no fill frames in this case, which is one piece of the problem described in issue OS#1950. Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Related: OS#1950 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml M library/RSL_Types.ttcn 3 files changed, 106 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/10372/2 -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:47:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:47:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10372 ) Change subject: add DTX fill frame BTS tests ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10372/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/10372/2/bts/BTS_Tests.ttcn at 3855 PS2, Line 3855: 2.5 how do you get to this 2.5 seconds? IMHO, 104*4.6ms = 478ms. So The 104 frames should expire in half a second. Your tests wait five times that amount, so if 80% of the frames were lost, it would still pass? I think rather than relying on wall clock / system time of the test host, it would be best to count in terms of frame numbers received from L1. This means that from a given start frame number, start receiving until fn+104 is received as frame number, and then count over that interval. The host-side timeout is merely a guard timer, and it can be 2.5,5,10 or whatever amount of times long. https://gerrit.osmocom.org/#/c/10372/2/bts/BTS_Tests.ttcn at 3866 PS2, Line 3866: t_RslChanNr_Bm(1) I would structure the test in a way that it iterates over all the TCH/F we have. There are subtle differences in how individual timeslots are handled, so it makes sense to iterater over all of them. I think some of our other tests already do this. -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 07 Aug 2018 16:47:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:48:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:48:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Call f_bssap_start in TC_cr_before_reset In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10369 ) Change subject: Call f_bssap_start in TC_cr_before_reset ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icee085d5fe610061c85d7fe7cf62cbccd8cfa556 Gerrit-Change-Number: 10369 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 16:48:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:48:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:48:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Call f_bssap_start in TC_cr_before_reset In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10369 ) Change subject: Call f_bssap_start in TC_cr_before_reset ...................................................................... Call f_bssap_start in TC_cr_before_reset This function starts the SCCP component which will relay the BSSAP messages to/from port SCCP_SP_PORT which is connected to BSSAP_DIRECT. Ticket: OS#3286 Change-Id: Icee085d5fe610061c85d7fe7cf62cbccd8cfa556 --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index df1d1c2..f70edd0 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1765,6 +1765,8 @@ var boolean reset_ack_seen := false; f_init_bssap_direct(); + f_bssap_start(g_bssap[0]); + /* Make a blind connection attemt, to trigger the deadlock condition */ BSSAP_DIRECT.send(ts_BSSAP_CONNECT_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, 1, omit)); -- To view, visit https://gerrit.osmocom.org/10369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icee085d5fe610061c85d7fe7cf62cbccd8cfa556 Gerrit-Change-Number: 10369 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:48:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:48:33 +0000 Subject: Change in simtrace2[master]: jenkins: clean after upload In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10368 ) Change subject: jenkins: clean after upload ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie4421a6fa9207eb541107de9c14f265626f6be96 Gerrit-Change-Number: 10368 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 16:48:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:48:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:48:35 +0000 Subject: Change in simtrace2[master]: jenkins: clean after upload In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10368 ) Change subject: jenkins: clean after upload ...................................................................... jenkins: clean after upload the upload failed because after the firmware were built (make), they where removed (make clean). now they are removed only after the upload. Change-Id: Ie4421a6fa9207eb541107de9c14f265626f6be96 --- M contrib/jenkins.sh 1 file changed, 14 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5ce5993..bdf2b39 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,6 @@ echo echo "=============== $board / $app START ==============" make BOARD="$board" APP="$app" - make BOARD="$board" APP="$app" clean echo "=============== $board / $app RES:$? ==============" done @@ -56,19 +55,25 @@ make clean if [ "x$publish" = "x--publish" ]; then - echo - echo "=============== UPLOAD BUILD ==============" - mkdir out/ - cp firmware/bin/*.bin out/ + echo + echo "=============== UPLOAD BUILD ==============" - cat > "$WORKSPACE/known_hosts" < "$WORKSPACE/known_hosts" < Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:50:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:50:06 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/10371/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10371/1//COMMIT_MSG at 13 PS1, Line 13: it might make sense to dsecribe when this might be useful to do. https://gerrit.osmocom.org/#/c/10371/1/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/#/c/10371/1/src/gb/gprs_bssgp.c at 1267 PS1, Line 1267: void bssgp_fc_flush_queue(struct bssgp_flow_control *fc) please let's add doxygen comments for all newly introduced API. I know it sucks that existing APIs are not fully documented, but let's make sure at least new API is documented from day one. -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 07 Aug 2018 16:50:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:51:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:51:29 +0000 Subject: Change in osmo-msc[master]: mgcp: use codec information returned with ASSIGNMENT COMPL. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10367 ) Change subject: mgcp: use codec information returned with ASSIGNMENT COMPL. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9d5b1cd016d9a058b22a367d0e5e9f2ef447931a Gerrit-Change-Number: 10367 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 16:51:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:51:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:51:30 +0000 Subject: Change in osmo-msc[master]: mgcp: use codec information returned with ASSIGNMENT COMPL. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10367 ) Change subject: mgcp: use codec information returned with ASSIGNMENT COMPL. ...................................................................... mgcp: use codec information returned with ASSIGNMENT COMPL. When the assignment completes a choosen codec is returned. At the moment we do not use this information. - add struct members for codec info (both, RAN and CN) - parse codec info in BSSMAP ASSIGNMENT COMPLETE - use codec info on mgcp Since the MNCC API is not complete yet, we currently only use the codec info only on the internal MNCC yet. Change-Id: I9d5b1cd016d9a058b22a367d0e5e9f2ef447931a Related: OS#2728 --- M include/osmocom/msc/gsm_data.h M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_mgcp.c 4 files changed, 76 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index c79adde..27f7fc5 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -143,10 +143,13 @@ char local_addr_ran[INET_ADDRSTRLEN]; uint16_t remote_port_ran; char remote_addr_ran[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_ran; + uint16_t local_port_cn; char local_addr_cn[INET_ADDRSTRLEN]; uint16_t remote_port_cn; char remote_addr_cn[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_cn; } rtp; /* which Iu-CS connection, if any. */ diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 1ace43d..11d3673 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -502,11 +502,50 @@ return 0; } +/* Use the speech codec info we go with the assignment complete to dtermine + * which codec we will signal to the MGW */ +static enum mgcp_codecs mgcp_codec_from_sc(struct gsm0808_speech_codec *sc) +{ + switch (sc->type) { + case GSM0808_SCT_FR1: + return CODEC_GSM_8000_1; + break; + case GSM0808_SCT_FR2: + return CODEC_GSMEFR_8000_1; + break; + case GSM0808_SCT_FR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_FR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_FR5: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR1: + return CODEC_GSMHR_8000_1; + break; + case GSM0808_SCT_HR3: + return CODEC_AMR_8000_1; + break; + case GSM0808_SCT_HR4: + return CODEC_AMRWB_16000_1; + break; + case GSM0808_SCT_HR6: + return CODEC_AMRWB_16000_1; + break; + default: + return CODEC_PCMU_8000_1; + break; + } +} + /* Endpoint to handle assignment complete */ static int bssmap_rx_ass_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, struct tlv_parsed *tp) { struct sockaddr_storage rtp_addr; + struct gsm0808_speech_codec sc; struct sockaddr_in *rtp_addr_in; int rc; @@ -525,6 +564,15 @@ return -EINVAL; } + /* Decode speech codec (choosen) element */ + rc = gsm0808_dec_speech_codec(&sc, TLVP_VAL(tp, GSM0808_IE_SPEECH_CODEC), + TLVP_LEN(tp, GSM0808_IE_SPEECH_CODEC)); + if (rc < 0) { + LOGPCONN(conn, LOGL_ERROR, "Unable to decode speech codec (choosen).\n"); + return -EINVAL; + } + conn->rtp.codec_ran = mgcp_codec_from_sc(&sc); + /* use address / port supplied with the AoIP * transport address element */ if (rtp_addr.ss_family == AF_INET) { diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 8becd05..2c17e22 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -319,6 +319,15 @@ /* Which subscriber do we want to track trans1 or trans2? */ log_set_context(LOG_CTX_VLR_SUBSCR, trans1->vsub); + /* This call briding mechanism is only used with the internal MNCC. + * functionality (with external MNCC briding would be done by the PBX) + * This means we may just copy the codec info we have for the RAN side + * of the first leg to the CN side of both legs. This also means that + * if both legs use different codecs the MGW must perform transcoding + * on the second leg. */ + trans1->conn->rtp.codec_cn = trans1->conn->rtp.codec_ran; + trans2->conn->rtp.codec_cn = trans1->conn->rtp.codec_ran; + /* Bridge RTP streams */ rc = msc_mgcp_call_complete(trans1, trans2->conn->rtp.local_port_cn, trans2->conn->rtp.local_addr_cn); @@ -1716,6 +1725,16 @@ struct gsm_mncc_rtp *rtp = arg; struct in_addr addr; + /* FIXME: in *rtp we should get the codec information of the remote + * leg. We will have to populate trans->conn->rtp.codec_cn with a + * meaningful value based on this information but unfortunately we + * can't do that yet because the mncc API can not signal dynamic + * payload types yet. This must be fixed first. Also there may be + * additional members necessary in trans->conn->rtp because we + * somehow need to deal with dynamic payload types that do not + * comply to 3gpp's assumptions of payload type numbers on the A + * interface. See also related tickets: OS#3399 and OS1683 */ + /* Find callref */ trans = trans_find_by_callref(net, rtp->callref); if (!trans) { diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index f5bdeb7..e58b249 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -277,22 +277,16 @@ struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; - -#ifdef BUILD_IU struct gsm_trans *trans; struct gsm_subscriber_connection *conn; -#endif OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); - -#ifdef BUILD_IU trans = mgcp_ctx->trans; OSMO_ASSERT(trans); conn = trans->conn; OSMO_ASSERT(conn); -#endif /* NOTE: In case of error, we will not be able to perform any DLCX * operation because until this point we do not have requested any @@ -396,22 +390,16 @@ struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; - -#ifdef BUILD_IU struct gsm_trans *trans; struct gsm_subscriber_connection *conn; -#endif OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); - -#ifdef BUILD_IU trans = mgcp_ctx->trans; OSMO_ASSERT(trans); conn = trans->conn; OSMO_ASSERT(conn); -#endif switch (event) { case EV_CRCX_RAN_RESP: @@ -593,7 +581,9 @@ .conn_id = mgcp_ctx->conn_id_cn, .conn_mode = MGCP_CONN_RECV_SEND, .audio_ip = conn->rtp.remote_addr_cn, - .audio_port = conn->rtp.remote_port_cn + .audio_port = conn->rtp.remote_port_cn, + .codecs[0] = conn->rtp.codec_cn, + .codecs_len = 1 }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { @@ -710,7 +700,9 @@ .conn_id = mgcp_ctx->conn_id_ran, .conn_mode = MGCP_CONN_RECV_SEND, .audio_ip = conn->rtp.remote_addr_ran, - .audio_port = conn->rtp.remote_port_ran + .audio_port = conn->rtp.remote_port_ran, + .codecs[0] = conn->rtp.codec_ran, + .codecs_len = 1 }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { -- To view, visit https://gerrit.osmocom.org/10367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9d5b1cd016d9a058b22a367d0e5e9f2ef447931a Gerrit-Change-Number: 10367 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 7 16:52:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 7 Aug 2018 16:52:00 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-simtrace2_=C2=BB_a1=3D?= =?UTF-8?Q?default,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#74?= In-Reply-To: <1652610927.110.1533655025404.JavaMail.jenkins@jenkins.osmocom.org> References: <1652610927.110.1533655025404.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1665711801.111.1533660720997.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:52:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:52:46 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10370 ) Change subject: vty: add cmd "reset sgsn state" ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/10370/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10370/1//COMMIT_MSG at 10 PS1, Line 10: this requires a change to libosmocore/gb, please add this information including the Change-ID here. https://gerrit.osmocom.org/#/c/10370/1/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/10370/1/src/gprs/sgsn_vty.c at 802 PS1, Line 802: DEFUN(reset_sgsn_state, we might use a hidden command to prevent accidential use during production setups. -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 07 Aug 2018 16:52:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:54:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:54:19 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10363 to look at the new patch set (#2). Change subject: hlr: Add chapter on USSD configuration ...................................................................... hlr: Add chapter on USSD configuration Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 --- A OsmoHLR/chapters/ussd.adoc M OsmoHLR/osmohlr-usermanual.adoc 2 files changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/63/10363/2 -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:54:50 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 7 Aug 2018 16:54:50 +0000 Subject: Change in osmo-gsm-manuals[master]: Add initial OsmoMGW manual In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/10279 ) Change subject: Add initial OsmoMGW manual ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b4ff96309d280c6a63105a6e06a82ec2e7b6908 Gerrit-Change-Number: 10279 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 07 Aug 2018 16:54:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:55:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:55:29 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10363 ) Change subject: hlr: Add chapter on USSD configuration ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc File OsmoHLR/chapters/ussd.adoc: https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 35 PS1, Line 35: lient > s/lient/client/ Done https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 44 PS1, Line 44: USSD configuration in OsmoHLR happens within the `hlr` VTY node. > IDEA: maybe it makes sense to group all SS/USSD-related commands [?] I don't think it's needed at this point, and it would just complicate things. The HLR has very few VTY commands to begin with. https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 46 PS1, Line 46: `euse foobar-00-00-00-00-00-00` defines an EUSE with the given name `foobar` > AFAIR, this command also represents a separate EUSE_NODE, [?] yes. https://gerrit.osmocom.org/#/c/10363/1/OsmoHLR/chapters/ussd.adoc at 54 PS1, Line 54: #*100# > #* -> *# Done -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 07 Aug 2018 16:55:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:55:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:55:40 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10363 ) Change subject: hlr: Add chapter on USSD configuration ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 07 Aug 2018 16:55:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:56:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 16:56:15 +0000 Subject: Change in osmo-gsm-manuals[master]: Add initial OsmoMGW manual In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10279 ) Change subject: Add initial OsmoMGW manual ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b4ff96309d280c6a63105a6e06a82ec2e7b6908 Gerrit-Change-Number: 10279 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 07 Aug 2018 16:56:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 16:58:10 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 7 Aug 2018 16:58:10 +0000 Subject: Change in osmo-gsm-manuals[master]: Add initial OsmoMGW manual In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10279 to look at the new patch set (#4). Change subject: Add initial OsmoMGW manual ...................................................................... Add initial OsmoMGW manual Change-Id: I1b4ff96309d280c6a63105a6e06a82ec2e7b6908 --- M OsmoMGW/Makefile A OsmoMGW/chapters/configuration.adoc A OsmoMGW/chapters/counters.adoc A OsmoMGW/chapters/counters_generated.adoc A OsmoMGW/chapters/overview.adoc A OsmoMGW/chapters/running.adoc A OsmoMGW/osmomgw-usermanual-docinfo.xml A OsmoMGW/osmomgw-usermanual.adoc 8 files changed, 282 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/79/10279/4 -- To view, visit https://gerrit.osmocom.org/10279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1b4ff96309d280c6a63105a6e06a82ec2e7b6908 Gerrit-Change-Number: 10279 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:02:59 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 7 Aug 2018 17:02:59 +0000 Subject: Change in simtrace2[master]: jenkins: add simtrace/trace to the builds Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10373 Change subject: jenkins: add simtrace/trace to the builds ...................................................................... jenkins: add simtrace/trace to the builds trace is now stable enough on simtrace to be built and uploaded. Change-Id: I157fff9930d03a7ec52ecac4a1be0511ea66c010 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/73/10373/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index bdf2b39..99a6f00 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -25,7 +25,7 @@ export LD_LIBRARY_PATH="$inst/lib" BUILDS="" -BUILDS+="simtrace/dfu simtrace/cardem " # simtrace/trace simtrace/triple_play +BUILDS+="simtrace/dfu simtrace/cardem simtrace/trace " # simtrace/triple_play BUILDS+="qmod/dfu qmod/cardem " BUILDS+="owhw/dfu owhw/cardem " -- To view, visit https://gerrit.osmocom.org/10373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I157fff9930d03a7ec52ecac4a1be0511ea66c010 Gerrit-Change-Number: 10373 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:41:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 7 Aug 2018 17:41:12 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10363 ) Change subject: hlr: Add chapter on USSD configuration ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 07 Aug 2018 17:41:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:31 +0000 Subject: Change in osmo-sgsn[master]: tests: remove gmm unit tests In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9258 to look at the new patch set (#2). Change subject: tests: remove gmm unit tests ...................................................................... tests: remove gmm unit tests The test cases now implemented by TTCN3 which should not be as fragile as the unit tests. Because the unit tests expect a quite strong internal state to be happen. Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 --- M tests/sgsn/sgsn_test.c 1 file changed, 0 insertions(+), 818 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/9258/2 -- To view, visit https://gerrit.osmocom.org/9258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 Gerrit-Change-Number: 9258 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:31 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#2). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c A src/gprs/gprs_gmm_attach.h M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 8 files changed, 476 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/2 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:34 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdow... Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10374 Change subject: sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdown problems ...................................................................... sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdown problems When introducing multiple BSSGP instances, this tests has problem when shutting down the test. Change-Id: I0cd1adf072f8ba40343e51e41f23a1de6a2bd62c --- M sgsn/SGSN_Tests.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/10374/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 0a20dd6..ce796e8 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -979,11 +979,20 @@ } else { GTP.send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); } + + timer T := 5.0; + T.start; + alt { [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); } - [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { } + [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { + repeat; + } + [] T.timeout { + setverdict(fail, "Waiting for SM_DEACT_PDP_REQ_MT"); + } } } -- To view, visit https://gerrit.osmocom.org/10374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0cd1adf072f8ba40343e51e41f23a1de6a2bd62c Gerrit-Change-Number: 10374 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fill g_gb configs for the remaining Gb interfaces Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10375 Change subject: sgsn: fill g_gb configs for the remaining Gb interfaces ...................................................................... sgsn: fill g_gb configs for the remaining Gb interfaces When testing with multiple Routing Areas, multiple Gb interface are required. Change-Id: I7f56618110f04d99b1b43e69d89167e384b61a34 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/10375/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index ce796e8..6c94d14 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -188,6 +188,32 @@ }, sgsn_role := false }; + g_gb[1].cfg := { + nsei := 97, + bvci := 210, + cell_id := { + ra_id := { + lai := { + mcc_mnc := mcc_mnc, lac := 13200}, + rac := 0 + }, + cell_id := 20961 + }, + sgsn_role := false + }; + g_gb[2].cfg := { + nsei := 98, + bvci := 220, + cell_id := { + ra_id := { + lai := { + mcc_mnc := mcc_mnc, lac := 13300}, + rac := 0 + }, + cell_id := 20962 + }, + sgsn_role := false + }; f_init_gb(g_gb[0], "SGSN_Test-Gb0"); f_init_gsup("SGSN_Test"); -- To view, visit https://gerrit.osmocom.org/10375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7f56618110f04d99b1b43e69d89167e384b61a34 Gerrit-Change-Number: 10375 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10376 Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has multiple configuration values hardcoded. Add an offset parameter to NSStart which adds to: - the source udp port - nsei - nsvci. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn 1 file changed, 22 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10376/1 diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 01d45b4..1095ae5 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -72,7 +72,10 @@ out NsUnitdataRequest; } with { extension "internal" }; - function NSStart() runs on NS_CT { + function NSStart(integer init_offset := 0) runs on NS_CT { + offset := init_offset; + nsei := mp_nsei + offset; + nsvci := mp_nsvci + offset; f_init(); f_ScanEvents(); } @@ -80,7 +83,7 @@ private function f_init() runs on NS_CT { var Result res; /* Connect the UDP socket */ - res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {}}); + res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port + offset, 0, { udp := {}}); if (not ispresent(res.connId)) { setverdict(fail, "Could not connect NS UDP socket, check your configuration"); mtc.stop; @@ -97,6 +100,9 @@ /* NS-User SAP towards the user */ port NS_SP_PT NS_SP; + var integer offset := 0; + var Nsvci nsvci := 0 + var Nsvci nsei := 0 var NseState g_state := NSE_S_DEAD_BLOCKED; var ConnectionId g_conn_id := -1; @@ -118,11 +124,11 @@ var NseState old_state := g_state; g_state := new_state; log("NS State Transition: ", old_state, " -> ", new_state); - NS_SP.send(t_NsStsInd(mp_nsei, mp_nsvci, old_state, new_state)); + NS_SP.send(t_NsStsInd(nsei, nsvci, old_state, new_state)); } private function f_sendReset() runs on NS_CT { - NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, mp_nsvci, mp_nsei))); + NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, nsvci, nsei))); g_state := NSE_S_WAIT_RESET; } @@ -137,7 +143,7 @@ } private function f_sendBlock(NsCause cause) runs on NS_CT { - NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, mp_nsvci))); + NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, nsvci))); Tns_block.start; } @@ -176,9 +182,9 @@ } /* Respond to RESET with correct NSEI/NSVCI */ - [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, mp_nsvci, mp_nsei))) -> value rf { + [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, nsvci, nsei))) -> value rf { f_change_state(NSE_S_ALIVE_BLOCKED); - NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(mp_nsvci, mp_nsei))); + NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(nsvci, nsei))); } /* Respond to RESET with wrong NSEI/NSVCI */ @@ -210,7 +216,7 @@ } } else if (g_state == NSE_S_WAIT_RESET) { alt { - [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(mp_nsvci, mp_nsei))) -> value rf { + [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(nsvci, nsei))) -> value rf { f_change_state(NSE_S_ALIVE_BLOCKED); f_sendAlive(); f_sendUnblock(); @@ -219,8 +225,8 @@ } else if (g_state == NSE_S_ALIVE_BLOCKED) { alt { /* bogus block, just respond with ACK */ - [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf { - NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci))); + [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, nsvci))) -> value rf { + NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(nsvci))); } /* Respond to UNBLOCK with UNBLOCK-ACK + change state */ [] NSCP.receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value rf { @@ -244,26 +250,26 @@ NSCP.send(t_NS_Send(g_conn_id, t_NS_UNBLOCK_ACK)); } /* Respond to BLOCK with BLOCK-ACK + change state */ - [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf { - NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci))); + [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, nsvci))) -> value rf { + NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(nsvci))); Tns_block.stop; f_change_state(NSE_S_ALIVE_BLOCKED); } - [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(mp_nsvci))) -> value rf { + [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(nsvci))) -> value rf { Tns_block.stop; } /* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */ [] NSCP.receive(t_NS_RecvFrom(t_NS_UNITDATA(?, ?, ?))) -> value rf { - NS_SP.send(t_NsUdInd(mp_nsei, + NS_SP.send(t_NsUdInd(nsei, oct2int(rf.msg.pDU_NS_Unitdata.bVCI), rf.msg.pDU_NS_Unitdata.nS_SDU)); } /* NS-UNITDATA.req from user to NS-UNITDATA PDU on network */ - [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, ?, omit)) -> value ud_req { + [] NS_SP.receive(t_NsUdReq(nsei, ?, ?, omit)) -> value ud_req { /* using raw octetstring PDU */ NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, ud_req.sdu))); } - [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, omit, ?)) -> value ud_req { + [] NS_SP.receive(t_NsUdReq(nsei, ?, omit, ?)) -> value ud_req { /* using decoded BSSGP PDU that we need to encode first */ var octetstring enc := enc_PDU_BSSGP(ud_req.bssgp); NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc))); -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of B... Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10377 Change subject: BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of BSSGP ...................................................................... BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of BSSGP Change-Id: Ibd7abba826a08b582361e9c255e9c44185e14067 --- M library/BSSGP_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 112 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/10377/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index 8b3b9eb..a9d2a25 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -79,9 +79,9 @@ ***********************************************************************/ type component BSSGP_Client_CT { - port BSSGP_PT BSSGP; - port BSSGP_PT BSSGP_SIG; - port BSSGP_PROC_PT BSSGP_PROC; + port BSSGP_PT BSSGP[3]; + port BSSGP_PT BSSGP_SIG[3]; + port BSSGP_PROC_PT BSSGP_PROC[3]; }; /*********************************************************************** @@ -660,14 +660,14 @@ return dec; } -function f_bssgp_client_register(hexstring imsi, OCT4 tlli, BssgpCellId cell_id, BSSGP_PROC_PT PT := BSSGP_PROC) +function f_bssgp_client_register(hexstring imsi, OCT4 tlli, BssgpCellId cell_id, BSSGP_PROC_PT PT := BSSGP_PROC[0]) runs on BSSGP_Client_CT { PT.call(BSSGP_register_client:{imsi, tlli, cell_id}) { [] PT.getreply(BSSGP_register_client:{imsi, tlli, cell_id}) {}; } } -function f_bssgp_client_unregister(hexstring imsi, BSSGP_PROC_PT PT := BSSGP_PROC) +function f_bssgp_client_unregister(hexstring imsi, BSSGP_PROC_PT PT := BSSGP_PROC[0]) runs on BSSGP_Client_CT { PT.call(BSSGP_unregister_client:{imsi}) { [] PT.getreply(BSSGP_unregister_client:{imsi}) {}; @@ -675,7 +675,7 @@ } /* TS 44.064 7.2.1.1 LLGMM-ASSIGN */ -function f_bssgp_client_llgmm_assign(OCT4 tlli_old, OCT4 tlli_new, BSSGP_PROC_PT PT := BSSGP_PROC) +function f_bssgp_client_llgmm_assign(OCT4 tlli_old, OCT4 tlli_new, BSSGP_PROC_PT PT := BSSGP_PROC[0]) runs on BSSGP_Client_CT { PT.call(BSSGP_llgmm_assign:{tlli_old, tlli_new}) { [] PT.getreply(BSSGP_llgmm_assign:{tlli_old, tlli_new}) {}; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index dfd380d..107903f 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -59,9 +59,9 @@ ns_component := NS_CT.create; bssgp_component := BSSGP_CT.create; /* connect our BSSGP port to the BSSGP Emulation */ - connect(self:BSSGP, bssgp_component:BSSGP_SP); - connect(self:BSSGP_SIG, bssgp_component:BSSGP_SP_SIG); - connect(self:BSSGP_PROC, bssgp_component:BSSGP_PROC); + connect(self:BSSGP[0], bssgp_component:BSSGP_SP); + connect(self:BSSGP_SIG[0], bssgp_component:BSSGP_SP_SIG); + connect(self:BSSGP_PROC[0], bssgp_component:BSSGP_PROC); /* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/ connect(bssgp_component:BSCP, ns_component:NS_SP); /* connect lower-end of NS emulation to NS_CODEC_PORT (on top of IPl4) */ @@ -177,7 +177,7 @@ log(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); - BSSGP.send(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); + BSSGP[0].send(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); } /* Establish BSSGP connection to PCU */ @@ -187,8 +187,8 @@ f_init(); T.start alt { - [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { } + [] BSSGP[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout establishing BSSGP connection"); mtc.stop; @@ -206,17 +206,17 @@ f_init(); /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ - BSSGP_SIG.send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); - BSSGP_SIG.send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); + BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); + BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); while (true) { var BssgpDecoded bd; alt { - [] BSSGP.receive(tr_BD_L3_MT(?)) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(?)) -> value bd { log("BSSGP Rx: ", bd); } - [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } + [] BSSGP[0].receive { repeat; } } } } @@ -274,7 +274,7 @@ timer T := 5.0; T.start; alt { - [] BSSGP.receive(bd_exp) { + [] BSSGP[0].receive(bd_exp) { log("found matching BSSGP UL-UNITDATA PDU"); } [] T.timeout { @@ -346,14 +346,14 @@ while (true) { var BssgpDecoded bd; alt { - [] BSSGP.receive(tr_BD_BSSGP(?)) -> value bd { + [] BSSGP[0].receive(tr_BD_BSSGP(?)) -> value bd { log("BSSGP Rx: ", bd); //log("GMM Rx: ", dec_PDU_L3_MS_SGSN(pdu.payload)); g_mmctx.tlli := bd.bssgp.pDU_BSSGP_UL_UNITDATA.tLLI; tx_gmm(LLC_CR_DL_CMD, gmm_auth_req); } - [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } + [] BSSGP[0].receive { repeat; } } } } diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 6c94d14..c787310 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -250,8 +250,8 @@ }; vc_conn := BSSGP_ConnHdlr.create(id); - connect(vc_conn:BSSGP, gb.vc_BSSGP:BSSGP_SP); - connect(vc_conn:BSSGP_PROC, gb.vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[0], gb.vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[0], gb.vc_BSSGP:BSSGP_PROC); connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); @@ -312,14 +312,14 @@ altstep as_mm_identity() runs on BSSGP_ConnHdlr { var MobileL3_CommonIE_Types.MobileIdentityLV mi; - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } } @@ -365,7 +365,7 @@ var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; - BSSGP.receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; + BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; l3_mt := bd.l3_mt; var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); @@ -388,7 +388,7 @@ l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); } - BSSGP.send(l3_mo); + BSSGP[0].send(l3_mo); } else { /* wait for identity procedure */ f_sleep(1.0); @@ -494,16 +494,16 @@ * revisionLevelIndicatior is at the wrong place! */ attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; - BSSGP.send(attach_req); + BSSGP[0].send(attach_req); f_gmm_auth(umts_aka_challenge, force_gsm_sres); /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); } private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { @@ -555,16 +555,16 @@ private function f_TC_attach_auth_id_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) { /* don't send ID Response */ repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('09'O))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('09'O))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(fail, "Wrong Attach Reject Cause"); mtc.stop; } @@ -581,13 +581,13 @@ private function f_TC_attach_auth_sai_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { } } /* don't send SAI-response from HLR */ - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); setverdict(pass); } testcase TC_attach_auth_sai_timeout() runs on test_CT { @@ -601,14 +601,14 @@ private function f_TC_attach_auth_sai_reject(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { GSUP.send(ts_GSUP_SAI_ERR(g_pars.imsi, 23)); } } - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); setverdict(pass); } testcase TC_attach_auth_sai_reject() runs on test_CT { @@ -623,16 +623,16 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); /* Never follow-up with ISD_REQ or UL_RES */ alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); setverdict(fail); mtc.stop; @@ -652,17 +652,17 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { GSUP.send(ts_GSUP_UL_ERR(g_pars.imsi, 0)); } alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); setverdict(fail); mtc.stop; @@ -683,15 +683,15 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_combined() runs on test_CT { @@ -709,12 +709,12 @@ g_pars.net.expect_auth := false; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_accept_all() runs on test_CT { @@ -736,16 +736,16 @@ g_pars.net.expect_auth := false; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('07'O))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('07'O))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { setverdict(fail); mtc.stop; } @@ -768,13 +768,13 @@ private function f_TC_rau_unknown(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); + BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT('0a'O))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT('0a'O))) { setverdict(pass); } /* FIXME: Expect XID RESET? */ - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } testcase TC_rau_unknown() runs on test_CT { @@ -792,18 +792,18 @@ f_TC_attach(id); /* then send RAU */ - BSSGP.send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); + BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); - BSSGP.send(ts_GMM_RAU_COMPL); + BSSGP[0].send(ts_GMM_RAU_COMPL); setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { setverdict(fail, "Unexpected RAU Reject"); mtc.stop; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } testcase TC_attach_rau() runs on test_CT { @@ -818,7 +818,7 @@ function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; timer T := 5.0; - BSSGP.send(ts_GMM_DET_REQ_MO(detach_type, power_off)); + BSSGP[0].send(ts_GMM_DET_REQ_MO(detach_type, power_off)); if (expect_purge) { GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS)); GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi)); @@ -829,7 +829,7 @@ setverdict(fail, "Unexpected GSUP PURGE MS for unregistered TLLI"); mtc.stop; } - [power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { g_pars.ra := omit; setverdict(fail, "Unexpected ATTACH ACCEPT in no-power-off DETACH"); mtc.stop; @@ -838,12 +838,12 @@ [power_off] T.timeout { setverdict(pass); } - [not power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [not power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { g_pars.ra := omit; setverdict(pass); /* TODO: check if any PDP contexts are deactivated on network side? */ } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } @@ -945,7 +945,7 @@ recovery := ts_Recovery(apars.ggsn_restart_ctr); } - BSSGP.send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { f_process_gtp_ctx_act_req(apars, g_ud.gtpc); @@ -958,18 +958,18 @@ omit, recovery)); } alt { - [exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause))) { + [exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause))) { setverdict(pass); } - [exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT)) { + [exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT)) { setverdict(fail, "Unexpected PDP CTX ACT ACC"); mtc.stop; } - [not exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { + [not exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { setverdict(fail, "Unexpected PDP CTX ACT FAIL"); mtc.stop; } - [not exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(apars.tid, apars.sapi))) { + [not exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(apars.tid, apars.sapi))) { setverdict(pass); } [] as_xid(apars); @@ -980,14 +980,14 @@ var boolean exp_rej := ispresent(apars.exp_rej_cause); var Gtp1cUnitdata g_ud; - BSSGP.send(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); + BSSGP[0].send(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - BSSGP.clear; + BSSGP[0].clear; GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))) { setverdict(pass); } [] as_xid(apars); @@ -999,7 +999,7 @@ var integer seq_nr := 23; var GtpPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); - BSSGP.clear; + BSSGP[0].clear; if (error_ind) { GTP.send(ts_GTPU_ErrorIndication(peer, 0 /* seq */, apars.ggsn_tei_u, apars.ggsn_ip_u)); } else { @@ -1010,8 +1010,8 @@ T.start; alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { - BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { + BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); } [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { repeat; @@ -1115,7 +1115,7 @@ } private altstep as_xid(PdpActPars apars) runs on BSSGP_ConnHdlr { - [] BSSGP.receive(tr_BD_LLC(tr_LLC_XID(?, apars.sapi))) { + [] BSSGP[0].receive(tr_BD_LLC(tr_LLC_XID(?, apars.sapi))) { repeat; } } @@ -1160,7 +1160,7 @@ /* Expect PDU via BSSGP/LLC on simulated PCU from SGSN */ alt { [] as_xid(apars); - [] BSSGP.receive(tr_BD_SNDCP(apars.sapi, tr_SN_UD(apars.nsapi, payload))); + [] BSSGP[0].receive(tr_BD_SNDCP(apars.sapi, tr_SN_UD(apars.nsapi, payload))); } } @@ -1169,7 +1169,7 @@ /* Send PDU via SNDCP/LLC/BSSGP/NS via simulated MS/PCU to the SGSN */ var GtpPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); - BSSGP.send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, 0)); + BSSGP[0].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, 0)); /* Expect PDU via GTP from SGSN on simulated GGSN */ alt { [] GTP.receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)); @@ -1194,22 +1194,22 @@ /* PDP Context activation for not-attached subscriber; expect fail */ private function f_TC_pdp_act_unattached(charstring id) runs on BSSGP_ConnHdlr { var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); - BSSGP.send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); alt { /* We might want toalso actually expect a PDPC CTX ACT REJ? */ - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(?, ?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(?, ?))) { setverdict(pass); } [] GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) { setverdict(fail, "Unexpected GTP PDP CTX ACT"); mtc.stop; } - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(?, ?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(?, ?))) { setverdict(fail, "Unexpected SM PDP CTX ACT ACK"); mtc.stop; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } testcase TC_pdp_act_unattached() runs on test_CT { @@ -1341,8 +1341,8 @@ } var OCT1 cause_network_failure := int2oct(38, 1) alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true))) { - BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true))) { + BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } [] as_xid(apars); @@ -1410,20 +1410,20 @@ /* then activate PDP context */ f_pdp_ctx_act(apars); - BSSGP.clear; + BSSGP[0].clear; peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); GTP.send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); for (i := 0; i < 5; i := i+1) { alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) {} + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) {} [] as_xid(apars); } } GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {} - BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } testcase TC_attach_pdp_act_deact_mt_t3395_expire() runs on test_CT { @@ -1446,7 +1446,7 @@ timer T := 5.0; T.start; alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(*, *, *))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(*, *, *))) { T.stop; setverdict(fail, "Unexpected GMM Detach Request"); mtc.stop; @@ -1455,7 +1455,7 @@ setverdict(pass); mtc.stop; } - [] BSSGP.receive { + [] BSSGP[0].receive { repeat; } } @@ -1505,8 +1505,8 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); /* MS: receive a Detach Request */ - BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); - BSSGP.send(ts_GMM_DET_ACCEPT_MO); + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); + BSSGP[0].send(ts_GMM_DET_ACCEPT_MO); setverdict(pass); } @@ -1597,18 +1597,18 @@ var integer count_req := 0; var MobileL3_CommonIE_Types.MobileIdentityLV mi; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { /* break */ } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { /* ignore ID REQ IMEI */ count_req := count_req + 1; repeat; @@ -1645,20 +1645,20 @@ /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */ g_pars.p_tmsi := 'c0000035'O; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { /* break */ } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { /* ignore ID REQ IMSI */ count_req := count_req + 1; repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } } @@ -1719,16 +1719,16 @@ /* there is no auth */ g_pars.net.expect_auth := false; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(fail, "Received unexpected GMM Attach REJECT"); mtc.stop; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); setverdict(pass); } } @@ -1765,14 +1765,14 @@ private function f_TC_attach_check_complete_resend(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); f_gmm_auth(); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { /* break */ } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { /* ignore */ count_req := count_req + 1; repeat; -- To view, visit https://gerrit.osmocom.org/10377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd7abba826a08b582361e9c255e9c44185e14067 Gerrit-Change-Number: 10377 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: create 3 instances of BSSGP at the same time Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10378 Change subject: sgsn: create 3 instances of BSSGP at the same time ...................................................................... sgsn: create 3 instances of BSSGP at the same time Allows to use different BSSGP connection within a single test. Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf --- M sgsn/SGSN_Tests.ttcn 1 file changed, 66 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/10378/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index c787310..92f139f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -51,8 +51,11 @@ BssgpConfig cfg }; +type record length(3) of GbInstance GbInstances; +type record length(3) of BssgpCellId BssgpCellIds; + type component test_CT { - var GbInstance g_gb[3]; + var GbInstances g_gb; var GSUP_Emulation_CT vc_GSUP; var IPA_Emulation_CT vc_GSUP_IPA; @@ -92,21 +95,21 @@ OCT4 tlli, OCT4 tlli_old optional, RoutingAreaIdentificationV ra optional, - BssgpCellId bssgp_cell_id, + BssgpCellIds bssgp_cell_id, AuthVector vec optional, SGSN_ConnHdlrNetworkPars net, float t_guard }; -private function f_init_gb(inout GbInstance gb, charstring id) runs on test_CT { - gb.vc_NS := NS_CT.create(id & "-NS"); - gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP"); +private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { + gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)); + gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)); /* connect lower end of BSSGP emulation with NS upper port */ connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); /* connect lower end of NS emulation to NS codec port (on top of IPL4) */ map(gb.vc_NS:NSCP, system:NS_CODEC_PORT); - gb.vc_NS.start(NSStart()); + gb.vc_NS.start(NSStart(offset)); gb.vc_BSSGP.start(BssgpStart(gb.cfg)); } @@ -215,7 +218,9 @@ sgsn_role := false }; - f_init_gb(g_gb[0], "SGSN_Test-Gb0"); + f_init_gb(g_gb[0], "SGSN_Test-Gb0", 0); + f_init_gb(g_gb[1], "SGSN_Test-Gb0", 1); + f_init_gb(g_gb[2], "SGSN_Test-Gb0", 2); f_init_gsup("SGSN_Test"); f_init_gtp("SGSN_Test"); f_init_vty(); @@ -225,7 +230,7 @@ type function void_fn(charstring id) runs on BSSGP_ConnHdlr; /* helper function to create, connect and start a BSSGP_ConnHdlr component */ -function f_start_handler(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, +function f_start_handler(void_fn fn, charstring id, GbInstances gb, integer imsi_suffix, float t_guard := 30.0) runs on test_CT return BSSGP_ConnHdlr { var BSSGP_ConnHdlr vc_conn; @@ -243,15 +248,19 @@ tlli := f_gprs_tlli_random(), tlli_old := omit, ra := omit, - bssgp_cell_id := gb.cfg.cell_id, + bssgp_cell_id := { gb[0].cfg.cell_id, gb[1].cfg.cell_id, gb[2].cfg.cell_id }, vec := omit, net := net_pars, t_guard := t_guard }; vc_conn := BSSGP_ConnHdlr.create(id); - connect(vc_conn:BSSGP[0], gb.vc_BSSGP:BSSGP_SP); - connect(vc_conn:BSSGP_PROC[0], gb.vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[0], gb[0].vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[0], gb[0].vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[1], gb[1].vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[1], gb[1].vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[2], gb[2].vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[2], gb[2].vc_BSSGP:BSSGP_PROC); connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); @@ -277,7 +286,7 @@ g_pars := pars; /* register with BSSGP core */ - f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); /* tell GTP dispatcher to send this IMSI to us */ @@ -408,9 +417,9 @@ function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { /* mandatory IE */ var hexstring aa_plmn := f_RAI_to_plmn_hexstr(aa.routingAreaIdentification); - if (not (g_pars.bssgp_cell_id.ra_id.lai.mcc_mnc == aa_plmn)) { + if (not (g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc == aa_plmn)) { setverdict(fail, "mismatching PLMN in Attach Accept: " & hex2str(aa_plmn) - & "; expected " & hex2str(g_pars.bssgp_cell_id.ra_id.lai.mcc_mnc)); + & "; expected " & hex2str(g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc)); mtc.stop; } g_pars.ra := aa.routingAreaIdentification; @@ -515,7 +524,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], 1); + vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 1); vc_conn.done; } @@ -523,7 +532,7 @@ var BSSGP_ConnHdlr vc_conn; f_init('023042'H); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], 1001); + vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 1001); vc_conn.done; } @@ -535,7 +544,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), testcasename(), g_gb[0], 1002); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), testcasename(), g_gb, 1002); vc_conn.done; } @@ -547,7 +556,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), testcasename(), g_gb[0], 1003); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), testcasename(), g_gb, 1003); vc_conn.done; } @@ -573,7 +582,7 @@ testcase TC_attach_auth_id_timeout() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_auth_id_timeout), testcasename(), g_gb[0], 2, 40.0); + vc_conn := f_start_handler(refers(f_TC_attach_auth_id_timeout), testcasename(), g_gb, 2, 40.0); vc_conn.done; } @@ -593,7 +602,7 @@ testcase TC_attach_auth_sai_timeout() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_timeout), testcasename(), g_gb[0], 3); + vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_timeout), testcasename(), g_gb, 3); vc_conn.done; } @@ -614,7 +623,7 @@ testcase TC_attach_auth_sai_reject() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_reject), testcasename(), g_gb[0], 4); + vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_reject), testcasename(), g_gb, 4); vc_conn.done; } @@ -643,7 +652,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_timeout), testcasename(), g_gb[0], 5); + vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_timeout), testcasename(), g_gb, 5); vc_conn.done; } @@ -673,7 +682,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_reject), testcasename(), g_gb[0], 6); + vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_reject), testcasename(), g_gb, 6); vc_conn.done; } @@ -698,7 +707,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_combined), testcasename(), g_gb[0], 7); + vc_conn := f_start_handler(refers(f_TC_attach_combined), testcasename(), g_gb, 7); vc_conn.done; } @@ -722,7 +731,7 @@ f_init(); f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "auth-policy accept-all"); - vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb[0], 8); + vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb, 8); vc_conn.done; } @@ -732,7 +741,7 @@ /* Simulate a foreign IMSI */ g_pars.imsi := '001010123456789'H; - f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); g_pars.net.expect_auth := false; @@ -757,10 +766,10 @@ f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "auth-policy closed"); /* test with foreign IMSI: Must Reject */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb[0], 9); + vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb, 9); vc_conn.done; /* test with home IMSI: Must Accept */ - vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb[0], 10); + vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb, 10); vc_conn.done; } @@ -781,7 +790,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_rau_unknown), testcasename(), g_gb[0], 11); + vc_conn := f_start_handler(refers(f_TC_rau_unknown), testcasename(), g_gb, 11); vc_conn.done; } @@ -810,7 +819,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_rau), testcasename(), g_gb[0], 12); + vc_conn := f_start_handler(refers(f_TC_attach_rau), testcasename(), g_gb, 12); vc_conn.done; } @@ -855,7 +864,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_unknown_nopoweroff), testcasename(), g_gb[0], 13); + vc_conn := f_start_handler(refers(f_TC_detach_unknown_nopoweroff), testcasename(), g_gb, 13); vc_conn.done; } @@ -867,7 +876,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_unknown_poweroff), testcasename(), g_gb[0], 14); + vc_conn := f_start_handler(refers(f_TC_detach_unknown_poweroff), testcasename(), g_gb, 14); vc_conn.done; } @@ -882,7 +891,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_nopoweroff), testcasename(), g_gb[0], 15); + vc_conn := f_start_handler(refers(f_TC_detach_nopoweroff), testcasename(), g_gb, 15); vc_conn.done; } @@ -897,7 +906,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_poweroff), testcasename(), g_gb[0], 16); + vc_conn := f_start_handler(refers(f_TC_detach_poweroff), testcasename(), g_gb, 16); vc_conn.done; } @@ -1187,7 +1196,7 @@ testcase TC_attach_pdp_act() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act), testcasename(), g_gb[0], 17); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act), testcasename(), g_gb, 17); vc_conn.done; } @@ -1215,7 +1224,7 @@ testcase TC_pdp_act_unattached() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_pdp_act_unattached), testcasename(), g_gb[0], 18); + vc_conn := f_start_handler(refers(f_TC_pdp_act_unattached), testcasename(), g_gb, 18); vc_conn.done; } @@ -1234,7 +1243,7 @@ testcase TC_attach_pdp_act_user() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user), testcasename(), g_gb[0], 19); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user), testcasename(), g_gb, 19); vc_conn.done; } @@ -1253,7 +1262,7 @@ testcase TC_attach_pdp_act_ggsn_reject() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_ggsn_reject), testcasename(), g_gb[0], 20); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_ggsn_reject), testcasename(), g_gb, 20); vc_conn.done; } @@ -1274,7 +1283,7 @@ testcase TC_attach_pdp_act_user_deact_mo() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mo), testcasename(), g_gb[0], 21); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mo), testcasename(), g_gb, 21); vc_conn.done; } @@ -1295,7 +1304,7 @@ testcase TC_attach_pdp_act_user_deact_mt() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mt), testcasename(), g_gb[0], 22); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mt), testcasename(), g_gb, 22); vc_conn.done; } @@ -1314,7 +1323,7 @@ testcase TC_attach_second_attempt() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 22); + vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb, 22); vc_conn.done; } @@ -1354,7 +1363,7 @@ var BSSGP_ConnHdlr vc_conn; g_use_echo := true f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_echo), testcasename(), g_gb[0], 23, 30.0); + vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_echo), testcasename(), g_gb, 23, 30.0); vc_conn.done; g_use_echo := false } @@ -1394,7 +1403,7 @@ testcase TC_attach_restart_ctr_create() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_create), testcasename(), g_gb[0], 24, 30.0); + vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_create), testcasename(), g_gb, 24, 30.0); vc_conn.done; } @@ -1430,7 +1439,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_mt_t3395_expire), testcasename(), g_gb[0], 25, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_mt_t3395_expire), testcasename(), g_gb, 25, 60.0); vc_conn.done; } @@ -1478,7 +1487,7 @@ testcase TC_attach_pdp_act_user_error_ind_ggsn() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_error_ind_ggsn), testcasename(), g_gb[0], 26); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_error_ind_ggsn), testcasename(), g_gb, 26); vc_conn.done; } @@ -1490,7 +1499,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_update), testcasename(), g_gb[0], 31); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_update), testcasename(), g_gb, 31); vc_conn.done; } @@ -1521,7 +1530,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_withdraw), testcasename(), g_gb[0], 29); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_withdraw), testcasename(), g_gb, 29); vc_conn.done; } @@ -1551,7 +1560,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw), testcasename(), g_gb[0], 30); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw), testcasename(), g_gb, 30); vc_conn.done; } @@ -1567,7 +1576,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_update), testcasename(), g_gb[0], 30); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_update), testcasename(), g_gb, 30); vc_conn.done; } @@ -1586,7 +1595,7 @@ var charstring imsi := hex2str(f_gen_imsi(id)); f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_detach_check_subscriber_list), testcasename(), g_gb[0], id); + vc_conn := f_start_handler(refers(f_TC_attach_detach_check_subscriber_list), testcasename(), g_gb, id); vc_conn.done; f_vty_transceive_not_match(SGSNVTY, "show subscriber cache", pattern "* IMSI: {imsi}*"); @@ -1633,7 +1642,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_no_imei_response), testcasename(), g_gb[0], 32, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_no_imei_response), testcasename(), g_gb, 32, 60.0); vc_conn.done; } @@ -1681,7 +1690,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_no_imsi_response), testcasename(), g_gb[0], 35, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_no_imsi_response), testcasename(), g_gb, 35, 60.0); vc_conn.done; } @@ -1699,7 +1708,7 @@ f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], id); + vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, id); vc_conn.done; f_vty_transceive_match(SGSNVTY, "show subscriber cache", pattern "* IMSI: {imsi}*"); @@ -1714,7 +1723,7 @@ f_bssgp_client_unregister(g_pars.imsi); /* Simulate a foreign IMSI */ g_pars.imsi := '001010123456789'H; - f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* there is no auth */ g_pars.net.expect_auth := false; @@ -1753,11 +1762,11 @@ f_vty_config(SGSNVTY, "sgsn", "auth-policy closed"); f_vty_config(SGSNVTY, "sgsn", "imsi-acl del 001010123456789"); /* test with foreign IMSI: Must Reject */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb[0], 9); + vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb, 9); vc_conn.done; f_vty_config(SGSNVTY, "sgsn", "imsi-acl add 001010123456789"); /* test with same IMSI: Must Accept */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_imsi_added), testcasename(), g_gb[0], 10); + vc_conn := f_start_handler(refers(f_TC_attach_closed_imsi_added), testcasename(), g_gb, 10); vc_conn.done; } @@ -1794,7 +1803,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_check_complete_resend), testcasename(), g_gb[0], 36, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_check_complete_resend), testcasename(), g_gb, 36, 60.0); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/10378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf Gerrit-Change-Number: 10378 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce f_routing_area_update() Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10379 Change subject: sgsn: introduce f_routing_area_update() ...................................................................... sgsn: introduce f_routing_area_update() Will be used by future RAU tests Change-Id: I4064e013f73319f24bb893a9047c8b9eb7d6aac2 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 21 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/10379/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 92f139f..839fe3a 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -800,20 +800,8 @@ /* first perform regular attach */ f_TC_attach(id); - /* then send RAU */ - BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); - alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { - f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); - BSSGP[0].send(ts_GMM_RAU_COMPL); - setverdict(pass); - } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { - setverdict(fail, "Unexpected RAU Reject"); - mtc.stop; - } - [] BSSGP[0].receive { repeat; } - } + f_routing_area_update(g_pars.ra); + } testcase TC_attach_rau() runs on test_CT { var BSSGP_ConnHdlr vc_conn; @@ -1807,6 +1795,25 @@ vc_conn.done; } +private function f_routing_area_update(RoutingAreaIdentificationV ra, integer bssgp := 0) runs on BSSGP_ConnHdlr { + var BssgpDecoded bd; + + /* then send RAU */ + BSSGP[bssgp].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); + alt { + [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { + f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); + BSSGP[bssgp].send(ts_GMM_RAU_COMPL); + setverdict(pass); + } + [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { + setverdict(fail, "Unexpected RAU Reject"); + mtc.stop; + } + [] BSSGP[bssgp].receive { repeat; } + } +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); -- To view, visit https://gerrit.osmocom.org/10379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4064e013f73319f24bb893a9047c8b9eb7d6aac2 Gerrit-Change-Number: 10379 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce TC_attach_rau_a_a() Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10380 Change subject: sgsn: introduce TC_attach_rau_a_a() ...................................................................... sgsn: introduce TC_attach_rau_a_a() MS <-> SGSN: Successful Attach MS -> SGSN: Routing Area Update Request MS <- SGSN: Routing Area Update Accept MS -> SGSN: Routing Area Update Request MS <- SGSN: Routing Area Update Accept MS -> SGSN: Detach (PowerOff) Change-Id: Id76b4792c07816bcbe5e965f23c2b526df0923c3 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/10380/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 839fe3a..ab6f651 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1814,6 +1814,36 @@ } } +private function f_TC_attach_rau_a_a(charstring id) runs on BSSGP_ConnHdlr { + var BssgpDecoded bd; + + /* first perform regular attach */ + f_TC_attach(id); + + /* then send RAU */ + f_routing_area_update(g_pars.ra); + + /* do another RAU */ + f_routing_area_update(g_pars.ra); + + f_detach_mo(c_GMM_DTT_MO_GPRS, true, true); +} + +testcase TC_attach_rau_a_a() runs on test_CT { + /* MS <-> SGSN: Successful Attach + * MS -> SGSN: Routing Area Update Request + * MS <- SGSN: Routing Area Update Accept + * MS -> SGSN: Routing Area Update Request + * MS <- SGSN: Routing Area Update Accept + * MS -> SGSN: Detach (PowerOff) + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_rau_a_a), testcasename(), g_gb, 37); + vc_conn.done; +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1839,6 +1869,7 @@ execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 10.0 ); execute( TC_rau_unknown() ); execute( TC_attach_rau() ); + execute( TC_attach_rau_a_a() ); execute( TC_detach_unknown_nopoweroff() ); execute( TC_detach_unknown_poweroff() ); execute( TC_detach_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/10380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id76b4792c07816bcbe5e965f23c2b526df0923c3 Gerrit-Change-Number: 10380 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:37 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add f_cellid_to_RAI() Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10381 Change subject: sgsn: add f_cellid_to_RAI() ...................................................................... sgsn: add f_cellid_to_RAI() Returns a RoutingAreaIdentificationV from GbInstance. This will be useful when using multiple BSSGP and the g_pars.ra field is not the needed ra. Change-Id: Ide96213ab2f210590b86deaf370486c8a0a78058 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/10381/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index ab6f651..54a5fe1 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -101,6 +101,22 @@ float t_guard }; +private function f_cellid_to_RAI(in BssgpCellId cell_id) return RoutingAreaIdentificationV { + var BcdMccMnc mcc_mnc := cell_id.ra_id.lai.mcc_mnc; + + var RoutingAreaIdentificationV ret := { + mccDigit1 := mcc_mnc[0], + mccDigit2 := mcc_mnc[1], + mccDigit3 := mcc_mnc[2], + mncDigit3 := mcc_mnc[5], + mncDigit1 := mcc_mnc[3], + mncDigit2 := mcc_mnc[4], + lac := int2oct(cell_id.ra_id.lai.lac, 16), + rac := int2oct(cell_id.ra_id.rac, 8) + } + return ret; +}; + private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)); gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)); -- To view, visit https://gerrit.osmocom.org/10381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ide96213ab2f210590b86deaf370486c8a0a78058 Gerrit-Change-Number: 10381 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:37 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: add type record LLC_Entities Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10382 Change subject: BSSGP_Emulation: add type record LLC_Entities ...................................................................... BSSGP_Emulation: add type record LLC_Entities In prepartion of moving the LLC layer out of the BSSGP Change-Id: I1a8c6a608c84a984e542510482bbfc5394ae6658 --- M library/BSSGP_Emulation.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/10382/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index a9d2a25..ca97ccd 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -116,6 +116,8 @@ var ClientEntity ClientTable[16]; } +type record length(16) of LLC_Entity LLC_Entities; + type record ClientEntity { OCT4 tlli, OCT4 tlli_old optional, -- To view, visit https://gerrit.osmocom.org/10382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a8c6a608c84a984e542510482bbfc5394ae6658 Gerrit-Change-Number: 10382 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:37 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: move LLC layer out of BSSGP Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10383 Change subject: BSSGP_Emulation: move LLC layer out of BSSGP ...................................................................... BSSGP_Emulation: move LLC layer out of BSSGP The LLC layer needs to be accessed by the SGSN tests in order to do multi-BSSGP tests. Otherwise the sgsn will see LLC frame with wrong sequence numbers and drop them. Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 --- M library/BSSGP_Emulation.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 54 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/10383/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index ca97ccd..c650fd5 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -136,6 +136,14 @@ uint9_t n_u_rx_last optional }; +function f_llc_create(boolean sgsn_role := false) return LLC_Entities { + var LLC_Entities llc; + for (var integer i := 0; i < 16; i := i+1) { + llc[i] := valueof(t_LLC_init(sgsn_role)); + } + return llc; +} + private template LLC_Entity t_LLC_init(boolean sgsn_role := false) := { sgsn_role := sgsn_role, n_u_tx_next := 0, @@ -576,13 +584,13 @@ } } -private function f_llc_get_n_u_tx(inout LLC_Entity llc) return uint9_t { +function f_llc_get_n_u_tx(inout LLC_Entity llc) return uint9_t { var uint9_t ret := llc.n_u_tx_next; llc.n_u_tx_next := llc.n_u_tx_next + 1; return ret; } -private function f_llc_sapi_by_l3_mo(PDU_L3_MS_SGSN l3_mo) return BIT4 { +function f_llc_sapi_by_l3_mo(PDU_L3_MS_SGSN l3_mo) return BIT4 { if (ischosen(l3_mo.msgs.gprs_mm)) { return c_LLC_SAPI_LLGMM; } else if (ischosen(l3_mo.msgs.gprs_sm)) { diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 54a5fe1..974576f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -73,6 +73,7 @@ type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr { var BSSGP_ConnHdlrPars g_pars; timer g_Tguard; + var LLC_Entities llc; } type record SGSN_ConnHdlrNetworkPars { @@ -301,6 +302,8 @@ /* do some common stuff like setting up g_pars */ g_pars := pars; + llc := f_llc_create(false); + /* register with BSSGP core */ f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* tell GSUP dispatcher to send this IMSI to us */ @@ -335,16 +338,24 @@ f_sleep(20.0); } +function f_send_llc(template PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr { + var octetstring l3_enc := enc_PDU_L3_MS_SGSN(valueof(l3_mo)); + var BIT4 sapi := f_llc_sapi_by_l3_mo(valueof(l3_mo)); + var integer n_u := f_llc_get_n_u_tx(llc[bit2int(sapi)]); + var octetstring llc_enc := enc_PDU_LLC(valueof(ts_LLC_UI(l3_enc, sapi, '0'B, n_u))); + BSSGP[gb_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[gb_index], llc_enc)); +} + altstep as_mm_identity() runs on BSSGP_ConnHdlr { var MobileL3_CommonIE_Types.MobileIdentityLV mi; [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_llc(ts_GMM_ID_RESP(mi)); repeat; } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_llc(ts_GMM_ID_RESP(mi)); repeat; } } @@ -413,7 +424,7 @@ l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); } - BSSGP[0].send(l3_mo); + f_send_llc(l3_mo); } else { /* wait for identity procedure */ f_sleep(1.0); @@ -519,7 +530,7 @@ * revisionLevelIndicatior is at the wrong place! */ attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; - BSSGP[0].send(attach_req); + f_send_llc(attach_req); f_gmm_auth(umts_aka_challenge, force_gsm_sres); /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -528,7 +539,7 @@ f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_llc(ts_GMM_ATTACH_COMPL); } private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { @@ -580,7 +591,7 @@ private function f_TC_attach_auth_id_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) { /* don't send ID Response */ @@ -606,7 +617,7 @@ private function f_TC_attach_auth_sai_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { } @@ -626,7 +637,7 @@ private function f_TC_attach_auth_sai_reject(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { @@ -648,7 +659,7 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); @@ -677,7 +688,7 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { @@ -708,7 +719,7 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -716,7 +727,7 @@ BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_combined() runs on test_CT { @@ -734,12 +745,12 @@ g_pars.net.expect_auth := false; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_accept_all() runs on test_CT { @@ -761,7 +772,7 @@ g_pars.net.expect_auth := false; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('07'O))) { @@ -793,7 +804,7 @@ private function f_TC_rau_unknown(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); + f_send_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT('0a'O))) { setverdict(pass); @@ -831,7 +842,7 @@ function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; timer T := 5.0; - BSSGP[0].send(ts_GMM_DET_REQ_MO(detach_type, power_off)); + f_send_llc(ts_GMM_DET_REQ_MO(detach_type, power_off)); if (expect_purge) { GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS)); GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi)); @@ -958,7 +969,7 @@ recovery := ts_Recovery(apars.ggsn_restart_ctr); } - BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + f_send_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { f_process_gtp_ctx_act_req(apars, g_ud.gtpc); @@ -993,7 +1004,7 @@ var boolean exp_rej := ispresent(apars.exp_rej_cause); var Gtp1cUnitdata g_ud; - BSSGP[0].send(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); + f_send_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); BSSGP[0].clear; @@ -1024,7 +1035,7 @@ alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { - BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); } [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { repeat; @@ -1207,7 +1218,7 @@ /* PDP Context activation for not-attached subscriber; expect fail */ private function f_TC_pdp_act_unattached(charstring id) runs on BSSGP_ConnHdlr { var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); - BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + f_send_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); alt { /* We might want toalso actually expect a PDPC CTX ACT REJ? */ @@ -1355,7 +1366,7 @@ var OCT1 cause_network_failure := int2oct(38, 1) alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true))) { - BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } [] as_xid(apars); @@ -1436,7 +1447,7 @@ GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {} - BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } testcase TC_attach_pdp_act_deact_mt_t3395_expire() runs on test_CT { @@ -1519,7 +1530,7 @@ /* MS: receive a Detach Request */ BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); - BSSGP[0].send(ts_GMM_DET_ACCEPT_MO); + f_send_llc(ts_GMM_DET_ACCEPT_MO); setverdict(pass); } @@ -1610,7 +1621,7 @@ var integer count_req := 0; var MobileL3_CommonIE_Types.MobileIdentityLV mi; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { @@ -1618,7 +1629,7 @@ } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_llc(ts_GMM_ID_RESP(mi)); repeat; } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { @@ -1658,7 +1669,7 @@ /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */ g_pars.p_tmsi := 'c0000035'O; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { @@ -1671,7 +1682,7 @@ } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_llc(ts_GMM_ID_RESP(mi)); repeat; } } @@ -1732,7 +1743,7 @@ /* there is no auth */ g_pars.net.expect_auth := false; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { @@ -1741,7 +1752,7 @@ } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); } } @@ -1778,7 +1789,7 @@ private function f_TC_attach_check_complete_resend(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); f_gmm_auth(); alt { @@ -1815,11 +1826,11 @@ var BssgpDecoded bd; /* then send RAU */ - BSSGP[bssgp].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); + f_send_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp); alt { [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); - BSSGP[bssgp].send(ts_GMM_RAU_COMPL); + f_send_llc(ts_GMM_RAU_COMPL, bssgp); setverdict(pass); } [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { -- To view, visit https://gerrit.osmocom.org/10383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 Gerrit-Change-Number: 10383 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:37 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10384 Change subject: BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) ...................................................................... BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) As the llc is handled outside, this function is not anymore needed Change-Id: Ib910dec4a54e155573c162a70731f20cbf1e9c5d --- M library/BSSGP_Emulation.ttcn 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/10384/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index c650fd5..ea242d3 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -560,14 +560,6 @@ BSCP.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); } - [not g_cfg.sgsn_role] BSSGP_SP.receive(PDU_L3_MS_SGSN:?) -> value l3_mo sender vc_conn { - var integer idx := f_tbl_idx_by_comp(vc_conn); - var octetstring l3_enc := enc_PDU_L3_MS_SGSN(l3_mo); - var BIT4 sapi := f_llc_sapi_by_l3_mo(l3_mo); - var integer n_u := f_llc_get_n_u_tx(ClientTable[idx].llc[bit2int(sapi)]); - var octetstring llc_enc := enc_PDU_LLC(valueof(ts_LLC_UI(l3_enc, sapi, '0'B, n_u))); - BSCP.send(f_BnsUdReq(ts_BSSGP_UL_UD(ClientTable[idx].tlli, ClientTable[idx].cell_id, llc_enc), g_cfg.bvci)); - } [g_cfg.sgsn_role] BSSGP_SP.receive(PDU_L3_SGSN_MS:?) -> value l3_mt sender vc_conn { var integer idx := f_tbl_idx_by_comp(vc_conn); var octetstring l3_enc := enc_PDU_L3_SGSN_MS(l3_mt); -- To view, visit https://gerrit.osmocom.org/10384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib910dec4a54e155573c162a70731f20cbf1e9c5d Gerrit-Change-Number: 10384 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:38 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: dont fail when removing a non-exitent client Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10385 Change subject: BSSGP_Emulation: dont fail when removing a non-exitent client ...................................................................... BSSGP_Emulation: dont fail when removing a non-exitent client On multiple BSSGP tests the IMSI might not anymore registered to the first BSSGP Change-Id: Ibad8971e5acc2691da29cf7fa394d1d58eea79a4 --- M library/BSSGP_Emulation.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/10385/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index ea242d3..fa33f51 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -321,8 +321,8 @@ return; } } - setverdict(fail, "Could not find client for IMSI ", imsi); - mtc.stop; + log("Warning: Could not find client for IMSI ", imsi); + return; } /* TS 44.064 7.2.1.1 LLGMM-ASSIGN */ -- To view, visit https://gerrit.osmocom.org/10385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibad8971e5acc2691da29cf7fa394d1d58eea79a4 Gerrit-Change-Number: 10385 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:38 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien... Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10386 Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept ...................................................................... sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept f_process_rau_accept can send the RAU Complete over the correct BSSGP Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/10386/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 974576f..1ee71b6 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -433,12 +433,12 @@ deactivate(di); } -function f_upd_ptmsi_and_tlli(OCT4 p_tmsi) runs on BSSGP_ConnHdlr { +function f_upd_ptmsi_and_tlli(OCT4 p_tmsi, integer bsspb := 0) runs on BSSGP_ConnHdlr { g_pars.p_tmsi := p_tmsi; /* update TLLI */ g_pars.tlli_old := g_pars.tlli; g_pars.tlli := g_pars.p_tmsi or4b 'c0000000'O; - f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli); + f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[bsspb]); } function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { @@ -470,7 +470,7 @@ /* T3302, T3319, T3323, T3312_ext, T3324 */ } -function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra) runs on BSSGP_ConnHdlr { +function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra, integer bsspb := 0) runs on BSSGP_ConnHdlr { /* mandatory IE */ g_pars.ra := ra.routingAreaId; if (ispresent(ra.allocatedPTMSI)) { @@ -478,7 +478,7 @@ setverdict(fail, "unexpected P-TMSI allocation"); mtc.stop; } - f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets); + f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, bsspb); } if (ispresent(ra.msIdentity)) { setverdict(fail, "unexpected TMSI allocation in non-combined attach"); @@ -839,10 +839,10 @@ } /* general GPRS DETACH helper */ -function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge) runs on BSSGP_ConnHdlr { +function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge, integer bssgp := 0) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; timer T := 5.0; - f_send_llc(ts_GMM_DET_REQ_MO(detach_type, power_off)); + f_send_llc(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp); if (expect_purge) { GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS)); GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi)); @@ -853,7 +853,7 @@ setverdict(fail, "Unexpected GSUP PURGE MS for unregistered TLLI"); mtc.stop; } - [power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [power_off] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { g_pars.ra := omit; setverdict(fail, "Unexpected ATTACH ACCEPT in no-power-off DETACH"); mtc.stop; @@ -862,12 +862,12 @@ [power_off] T.timeout { setverdict(pass); } - [not power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [not power_off] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { g_pars.ra := omit; setverdict(pass); /* TODO: check if any PDP contexts are deactivated on network side? */ } - [] BSSGP[0].receive { repeat; } + [] BSSGP[bssgp].receive { repeat; } } } @@ -1829,7 +1829,7 @@ f_send_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp); alt { [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { - f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); + f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp); f_send_llc(ts_GMM_RAU_COMPL, bssgp); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:38 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce TC_attach_rau_a_b Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10387 Change subject: sgsn: introduce TC_attach_rau_a_b ...................................................................... sgsn: introduce TC_attach_rau_a_b MS <-> SGSN: Successful Attach MS -> SGSN: Routing Area _a_ Update Request MS <- SGSN: Routing Area _a_ Update Accept MS -> SGSN: Routing Area _b_ Update Request MS <- SGSN: Routing Area _b_ Update Accept MS -> SGSN: Detach (PowerOff) Change-Id: Ie636778628c216e315bd6f5bc11e0e5bd9c218a5 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/10387/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1ee71b6..18e9c20 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1871,6 +1871,39 @@ vc_conn.done; } +private function f_TC_attach_rau_a_b(charstring id) runs on BSSGP_ConnHdlr { + var BssgpDecoded bd; + + f_TC_attach(id); + + log("attach complete sending rau"); + f_routing_area_update(g_pars.ra, 0); + + log("rau complete unregistering"); + f_bssgp_client_unregister(g_pars.imsi); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[1], BSSGP_PROC[1]); + + log("sending second RAU via different RA"); + f_routing_area_update(f_cellid_to_RAI(g_pars.bssgp_cell_id[1]), 1); + + f_detach_mo(c_GMM_DTT_MO_GPRS, true, true, 1); +} + +testcase TC_attach_rau_a_b() runs on test_CT { + /* MS <-> SGSN: Successful Attach + * MS -> SGSN: Routing Area _a_ Update Request + * MS <- SGSN: Routing Area _a_ Update Accept + * MS -> SGSN: Routing Area _b_ Update Request + * MS <- SGSN: Routing Area _b_ Update Accept + * MS -> SGSN: Detach (PowerOff) + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_rau_a_b), testcasename(), g_gb, 38); + vc_conn.done; +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1897,6 +1930,7 @@ execute( TC_rau_unknown() ); execute( TC_attach_rau() ); execute( TC_attach_rau_a_a() ); + execute( TC_attach_rau_a_b() ); execute( TC_detach_unknown_nopoweroff() ); execute( TC_detach_unknown_poweroff() ); execute( TC_detach_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/10387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie636778628c216e315bd6f5bc11e0e5bd9c218a5 Gerrit-Change-Number: 10387 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:38 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: use vty cmd `reset sgsn state`. Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10388 Change subject: sgsn: use vty cmd `reset sgsn state`. ...................................................................... sgsn: use vty cmd `reset sgsn state`. Cleans most of the sgsn state. Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/10388/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 18e9c20..07bf5fd 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -178,6 +178,7 @@ map(self:SGSNVTY, system:SGSNVTY); f_vty_set_prompts(SGSNVTY); f_vty_transceive(SGSNVTY, "enable"); + f_vty_transceive(SGSNVTY, "reset sgsn state"); f_vty_config(SGSNVTY, "sgsn", "auth-policy remote"); } @@ -235,12 +236,12 @@ sgsn_role := false }; + f_init_vty(); f_init_gb(g_gb[0], "SGSN_Test-Gb0", 0); f_init_gb(g_gb[1], "SGSN_Test-Gb0", 1); f_init_gb(g_gb[2], "SGSN_Test-Gb0", 2); f_init_gsup("SGSN_Test"); f_init_gtp("SGSN_Test"); - f_init_vty(); f_vty_enable_echo_interval(g_use_echo); } -- To view, visit https://gerrit.osmocom.org/10388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 Gerrit-Change-Number: 10388 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: increase the timeout of some TC Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10389 Change subject: sgsn: increase the timeout of some TC ...................................................................... sgsn: increase the timeout of some TC Because of multiple BSSGP connections, the tests need more time to complete. Change-Id: I12baf4b2425d0d862755d03d16127b18968e28f2 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/10389/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 07bf5fd..dcfefaf 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1920,14 +1920,14 @@ execute( TC_attach_closed() ); execute( TC_attach_no_imei_response() ); execute( TC_attach_no_imsi_response() ); - execute( TC_attach_closed_add_vty(), 10.0 ); - execute( TC_attach_check_subscriber_list(), 10.0 ); - execute( TC_attach_detach_check_subscriber_list(), 10.0 ); + execute( TC_attach_closed_add_vty(), 20.0 ); + execute( TC_attach_check_subscriber_list(), 20.0 ); + execute( TC_attach_detach_check_subscriber_list(), 20.0 ); execute( TC_attach_check_complete_resend() ); - execute( TC_hlr_location_cancel_request_update(), 10.0 ); - execute( TC_hlr_location_cancel_request_withdraw(), 10.0 ); - execute( TC_hlr_location_cancel_request_unknown_subscriber_withdraw(), 10.0 ); - execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 10.0 ); + execute( TC_hlr_location_cancel_request_update(), 20.0 ); + execute( TC_hlr_location_cancel_request_withdraw(), 20.0 ); + execute( TC_hlr_location_cancel_request_unknown_subscriber_withdraw(), 20.0 ); + execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 20.0 ); execute( TC_rau_unknown() ); execute( TC_attach_rau() ); execute( TC_attach_rau_a_a() ); -- To view, visit https://gerrit.osmocom.org/10389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I12baf4b2425d0d862755d03d16127b18968e28f2 Gerrit-Change-Number: 10389 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix TC_attach_check_complete_resend Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10390 Change subject: sgsn: fix TC_attach_check_complete_resend ...................................................................... sgsn: fix TC_attach_check_complete_resend TC_attach_check_complete_resend tests if the SGSN sends out the SGSN Attach Accept multiple times. If the MS disappear, there is no need for a ATTACH REJECT. Change-Id: I3fa5c100b8389e184acf1e71e2792e5474c22dec --- M sgsn/SGSN_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/10390/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index dcfefaf..43c297e 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1793,13 +1793,16 @@ f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); f_gmm_auth(); + timer T := 10.0; + T.start; alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] T.timeout { /* break */ } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { /* ignore */ count_req := count_req + 1; + T.start; repeat; } } -- To view, visit https://gerrit.osmocom.org/10390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3fa5c100b8389e184acf1e71e2792e5474c22dec Gerrit-Change-Number: 10390 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:40 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: rework TC_attach_closed_add_vty to be executed in a single BSSG... Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10391 Change subject: sgsn: rework TC_attach_closed_add_vty to be executed in a single BSSGP_ConnHldr ...................................................................... sgsn: rework TC_attach_closed_add_vty to be executed in a single BSSGP_ConnHldr When stopping and starting BSSGP_ConnHdlr multiple times, there are Port connecting problems. Using a single iteration of BSSGP_ConnHldr.start() works around this problem. Change-Id: I8e5ae832f3908a172b9beb6d936074b806e0c799 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/10391/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 43c297e..a6a3c6c 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1738,7 +1738,7 @@ /* unregister the old IMSI */ f_bssgp_client_unregister(g_pars.imsi); /* Simulate a foreign IMSI */ - g_pars.imsi := '001010123456789'H; + g_pars.imsi := '001010123456700'H; f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* there is no auth */ @@ -1758,6 +1758,15 @@ } } } + +private function f_TC_attach_closed_add_vty(charstring id) runs on BSSGP_ConnHdlr { + + f_TC_attach_closed_foreign(id); + f_TC_attach_closed_imsi_added(id); + +} + + testcase TC_attach_closed_add_vty() runs on test_CT { /* VTY-> SGSN: policy close * MS -> SGSN: Attach Request @@ -1777,12 +1786,10 @@ f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "auth-policy closed"); f_vty_config(SGSNVTY, "sgsn", "imsi-acl del 001010123456789"); + f_vty_config(SGSNVTY, "sgsn", "imsi-acl del 001010123456700"); + f_vty_config(SGSNVTY, "sgsn", "imsi-acl add 001010123456700"); /* test with foreign IMSI: Must Reject */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb, 9); - vc_conn.done; - f_vty_config(SGSNVTY, "sgsn", "imsi-acl add 001010123456789"); - /* test with same IMSI: Must Accept */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_imsi_added), testcasename(), g_gb, 10); + vc_conn := f_start_handler(refers(f_TC_attach_closed_add_vty), testcasename(), g_gb, 9); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/10391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e5ae832f3908a172b9beb6d936074b806e0c799 Gerrit-Change-Number: 10391 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 17:56:40 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 17:56:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10392 Change subject: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach ...................................................................... sgsn: add TC_attach_gmm_attach_req_while_gmm_attach Testing the corner case of receiving a Attach Request while not (yet) sent an Attach Request. MS -> SGSN: Attach Request IMSI MS <- SGSN: Identity Request IMSI (optional) MS -> SGSN: Identity Response IMSI (optional) MS <- SGSN: Identity Request IMEI MS -> SGSN: Attach Request (2nd) MS <- SGSN: Identity Response IMEI MS <- SGSN: Attach Accept MS -> SGSN: Attach Complete Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/10392/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index a6a3c6c..2c987c4 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1915,6 +1915,78 @@ vc_conn.done; } +private function f_TC_attach_gmm_attach_req_while_gmm_attach(charstring id) runs on BSSGP_ConnHdlr { + var integer count_req := 0; + var MobileL3_CommonIE_Types.MobileIdentityLV mi; + var RoutingAreaIdentificationV rand_rai := f_random_RAI(); + var BssgpDecoded bd; + + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); + + alt { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + setverdict(fail, "Unexpected GMM ATTACH REJECT"); + mtc.stop; + } + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + f_send_llc(ts_GMM_ID_RESP(mi)); + repeat; + } + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + /* send out a second GMM_Attach Request. + * If the SGSN follows the rules, this 2nd ATTACH REQ should be ignored, because + * of the same content */ + f_send_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit)); + mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); + f_send_llc(ts_GMM_ID_RESP(mi)); + } + } + f_sleep(1.0); + + /* we've sent already a IMEI answer, we should NOT asked again for IMEI */ + alt { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + f_send_llc(ts_GMM_ID_RESP(mi)); + repeat; + } + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + setverdict(fail, "Unexpected GMM ID REQ (IMEI)."); + mtc.stop; + } + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + setverdict(fail, "Unexpected GMM ATTACH REJECT"); + mtc.stop; + } + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); + f_send_llc(ts_GMM_ATTACH_COMPL); + setverdict(pass); + /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ + } + } +} + +testcase TC_attach_gmm_attach_req_while_gmm_attach() runs on test_CT { + /* Testing if the SGSN ignore Attach Request with the exact same content */ + /* MS -> SGSN: Attach Request IMSI + * MS <- SGSN: Identity Request IMSI (optional) + * MS -> SGSN: Identity Response IMSI (optional) + * MS <- SGSN: Identity Request IMEI + * MS -> SGSN: Attach Request (2nd) + * MS <- SGSN: Identity Response IMEI + * MS <- SGSN: Attach Accept + * MS -> SGSN: Attach Complete + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + f_vty_config(SGSNVTY, "sgsn", "auth-policy accept-all"); + vc_conn := f_start_handler(refers(f_TC_attach_gmm_attach_req_while_gmm_attach), testcasename(), g_gb, 39); + vc_conn.done; +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1957,6 +2029,7 @@ execute( TC_attach_restart_ctr_create() ); execute( TC_attach_pdp_act_deact_mt_t3395_expire() ); execute( TC_attach_pdp_act_user_error_ind_ggsn() ); + execute( TC_attach_gmm_attach_req_while_gmm_attach() ); } -- To view, visit https://gerrit.osmocom.org/10392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 Gerrit-Change-Number: 10392 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:03:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:03:44 +0000 Subject: Change in osmo-gsm-manuals[master]: Add initial OsmoMGW manual In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10279 ) Change subject: Add initial OsmoMGW manual ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1b4ff96309d280c6a63105a6e06a82ec2e7b6908 Gerrit-Change-Number: 10279 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 07 Aug 2018 18:03:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:03:46 +0000 Subject: Change in osmo-gsm-manuals[master]: Add initial OsmoMGW manual In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10279 ) Change subject: Add initial OsmoMGW manual ...................................................................... Add initial OsmoMGW manual Change-Id: I1b4ff96309d280c6a63105a6e06a82ec2e7b6908 --- M OsmoMGW/Makefile A OsmoMGW/chapters/configuration.adoc A OsmoMGW/chapters/counters.adoc A OsmoMGW/chapters/counters_generated.adoc A OsmoMGW/chapters/overview.adoc A OsmoMGW/chapters/running.adoc A OsmoMGW/osmomgw-usermanual-docinfo.xml A OsmoMGW/osmomgw-usermanual.adoc 8 files changed, 282 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/OsmoMGW/Makefile b/OsmoMGW/Makefile index 46c97e4..b092e66 100644 --- a/OsmoMGW/Makefile +++ b/OsmoMGW/Makefile @@ -1,5 +1,9 @@ TOPDIR = .. +ASCIIDOC = osmomgw-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(TOPDIR)/build/Makefile.asciidoc.inc + VTY_REFERENCE = osmomgw-vty-reference.xml include $(TOPDIR)/build/Makefile.vty-reference.inc diff --git a/OsmoMGW/chapters/configuration.adoc b/OsmoMGW/chapters/configuration.adoc new file mode 100644 index 0000000..c398f25 --- /dev/null +++ b/OsmoMGW/chapters/configuration.adoc @@ -0,0 +1,57 @@ +== Configuring OsmoMGW + +A basic configation of OsmoMGW mainly consists of specifying the IP address +and port on which to listen to MGCP commands, but changing the port range at +which the RTP streams terminate as well as limiting operation to a single call +agent can be done as well as changing the number of endpoints. + +=== Configuring MGCP + +By default OsmoMGW listens for MGCP on port 2427 on any IP address. If a call +agent address is configured then OsmoMGW will only answer MGCP commands from +that IP port 2727, otherwise all sources are handled. A domain can be +specified + +.Example: MGCP configuration +---- +OsmoMGW(config-mgcp)# bind ip 127.0.0.1 +OsmoMGW(config-mgcp)# bind port 2427 +OsmoMGW(config-mgcp)# call-agent ip 127.0.0.1 +OsmoMGW(config-mgcp)# domain mgw-bsc +OsmoMGW(config-mgcp)# local ip 127.0.0.1 +---- + +=== Configuring the trunk + +The first trunk (trunk 0) is considered a virtual trunk in OsmoMGW. All +endpoints of type "rtpbridge" are routed here. The virtual trunk is configured +in the config-mgcp context. + +All other trunks are configured in the config-mgcp-trunk context, but the +commands used are identical. Right now trunks are considered only for ds/e1 +type endpoints which are not yet implemented. Don't use trunks other than the +"virtual" trunk 0. + +.Example: MGCP trunk configuration +---- +OsmoMGW(config-mgcp)# number endpoints 63 <1> +OsmoMGW(config-mgcp)# rtp bind-ip 10.0.0.1 <2> +OsmoMGW(config-mgcp)# rtp port-range 12000-14000 <3> +---- +<1> Maximum number of endpoints that can be allocated at once +<2> Use this IP when binding RTP endpoints +<3> Use ports in this range when binding RTP endpoints + +There are some options to tweak how RTP forwarding behaves in OsmoMGW: + +.Example: MGCP trunk rtp options +---- +OsmoMGW(config-mgcp)# rtp keep-alive 30 <1> +OsmoMGW(config-mgcp)# rtp-patch ssrc <2> +OsmoMGW(config-mgcp)# rtp-patch timestamp <3> +---- +<1> Send dummy UDP packets periodically to RTP destination +<2> Hide SSRC changes +<3> Ensure RTP timestamp is aligned with frame duration + + diff --git a/OsmoMGW/chapters/counters.adoc b/OsmoMGW/chapters/counters.adoc new file mode 100644 index 0000000..7fbb10c --- /dev/null +++ b/OsmoMGW/chapters/counters.adoc @@ -0,0 +1,4 @@ +[[counters]] +== Counters + +include::./counters_generated.adoc[] diff --git a/OsmoMGW/chapters/counters_generated.adoc b/OsmoMGW/chapters/counters_generated.adoc new file mode 100644 index 0000000..20a4dec --- /dev/null +++ b/OsmoMGW/chapters/counters_generated.adoc @@ -0,0 +1,14 @@ + +// autogenerated by show asciidoc counters +These counters and their description based on OsmoMGW 1.3.0.34-9cd52 (OsmoMGW). + +=== Rate Counters + +// generating tables for rate_ctr_group +== Osmo Stat Items + +// generating tables for osmo_stat_items +== Osmo Counters + +// generating tables for osmo_counters +// there are no ungrouped osmo_counters diff --git a/OsmoMGW/chapters/overview.adoc b/OsmoMGW/chapters/overview.adoc new file mode 100644 index 0000000..6a8f3e3 --- /dev/null +++ b/OsmoMGW/chapters/overview.adoc @@ -0,0 +1,100 @@ +[[overview]] +== Overview + +This manual should help you getting started with OsmoMGW. It will cover +aspects of configuring and running the media gateway. + +[[intro_overview]] +=== About OsmoMGW + +OsmoMGW is the Osmocom implementation of a media gateway to handle user +plane (voice) traffic in cellular networks. It can connect and optionally +transcode RTP voice streams between different network elements such as BTSs +and external entities like SIP. It is typically co-located with both OsmoBSC +and OsmoMSC and controlled by them via MGCP, the Media Gateway Control +Protocol. + +[[fig-bsc]] +.OsmoMGW used with OsmoBSC +[graphviz] +---- +digraph G { + rankdir = LR; + OsmoBTS -> OsmoBSC [label="Abis/IP"]; + OsmoBSC -> OsmoMSC [label="3GPP AoIP"]; + OsmoBSC -> OsmoMGW [label="MGCP"]; + OsmoBTS -> OsmoMGW [label="RTP",dir=both]; + OsmoMGW -> OsmoMSC [label="RTP",dir=both]; + {rank=same OsmoBSC OsmoMGW} + OsmoMGW [color=red]; +} +---- + +[[fig-msc]] +.OsmoMGW used with OsmoMSC +[graphviz] +---- +digraph G { + rankdir = LR; + BTS -> BSC [label="Abis"]; + BSC -> OsmoMSC [label="3GPP AoIP"]; + OsmoMSC -> OsmoMGW [label="MGCP"]; + BSC -> OsmoMGW [label="RTP",dir=both]; + OsmoMSC -> OsmoSIP [label="MNCC"]; + OsmoSIP -> PBX [label="SIP Trunk"]; + OsmoMGW -> PBX [label="RTP",dir=both]; + {rank=same OsmoMSC OsmoMGW} + OsmoSIP [label="osmo-sip-connector"]; + OsmoMGW [color=red]; + + hNodeB -> OsmoHNBGW [label="Iuh"]; + OsmoHNBGW -> OsmoMSC [label="IuCS"]; + hNodeB -> OsmoMGW [label="RTP",dir=both]; +} +---- + +=== Software Components + +OsmoMGW contains a variety of different software components, which we?ll +quickly describe in this section. + +==== MGCP Implementation + +OsmoMGW brings its own MGCP implementation through which OsmoMGW is +controlled. + +The commands implemented are CRCX, MDCX, DLCX and RSIP. The command AUEP is +implemented as a stub and will simply respond with OK. + +==== RTP implementation + +Support for IuUP which is used in 3G cells is quite lacking at the moment. +3G<->3G and 2G<->2G calls should work, but 3G<->2G does not. + +==== Audio transcoder + +Transcoding is currently not supported in OsmoMGW. + +=== Limitations + +Osmux is not yet supported in OsmoMGW. + +At the moment (July 2018), OsmoMGW only implements RTP proxy / RTP bridge +type endpoints, to each of which two RTP connections can be established. +We are planning to add endpoint types for: + +- classic E1/T1 timeslots (64kBps alaw/ulaw) +- classic E1/T1 16k sub-slots with TRAU frames for classic BTS support +- announcement/playout end-points +- conference endpoints + +=== Additional resources + +You can find the OsmoMGW issue tracker and wiki online at + +- https://osmocom.org/projects/osmomgw +- https://osmocom.org/projects/osmomgw/wiki + +RFC 3435 for MGCP is located at + +- https://tools.ietf.org/html/rfc3435 diff --git a/OsmoMGW/chapters/running.adoc b/OsmoMGW/chapters/running.adoc new file mode 100644 index 0000000..8565ea5 --- /dev/null +++ b/OsmoMGW/chapters/running.adoc @@ -0,0 +1,25 @@ +== Running OsmoMGW + +The OsmoMGW executable (`osmo-mgw`) offers the following command-line +arguments: + +=== SYNOPSIS + +*osmo-mgw* [-h|-V] [-D] [-c 'CONFIGFILE'] [-s] + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-V, --version*:: + Print the compile-time version number of the OsmoBTS program +*-D, --daemonize*:: + Fork the process as a daemon into background. +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-mgw.cfg` in the current + working directory. +*-s, --disable-color*:: + Disable colors for logging to stderr. This has mostly been + deprecated by VTY based logging configuration, see <> + for more information. diff --git a/OsmoMGW/osmomgw-usermanual-docinfo.xml b/OsmoMGW/osmomgw-usermanual-docinfo.xml new file mode 100644 index 0000000..d801c9b --- /dev/null +++ b/OsmoMGW/osmomgw-usermanual-docinfo.xml @@ -0,0 +1,47 @@ + + + 1 + July 24th, 2018 + DW + + Initial version + + + + + + + Daniel + Willmann + dwillmann at sysmocom.de + DW + + sysmocom + sysmocom - s.f.m.c. GmbH + + + + + + 2018 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + + diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc new file mode 100644 index 0000000..69dc005 --- /dev/null +++ b/OsmoMGW/osmomgw-usermanual.adoc @@ -0,0 +1,31 @@ +:gfdl-enabled: +:program-name: OsmoMGW + +OsmoMGW User Manual +==================== +Daniel Willmann + + +include::../common/chapters/preface.adoc[] + +include::chapters/overview.adoc[] + +include::chapters/running.adoc[] + +include::../common/chapters/vty.adoc[] + +include::../common/chapters/logging.adoc[] + +include::chapters/configuration.adoc[] + +//include::chapters/counters.adoc[] + +include::../common/chapters/port_numbers.adoc[] + +include::../common/chapters/bibliography.adoc[] + +include::../common/chapters/glossary.adoc[] + +include::../common/chapters/gfdl.adoc[] + + -- To view, visit https://gerrit.osmocom.org/10279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1b4ff96309d280c6a63105a6e06a82ec2e7b6908 Gerrit-Change-Number: 10279 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:04:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:04:12 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: Add chapter on USSD configuration In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10363 ) Change subject: hlr: Add chapter on USSD configuration ...................................................................... hlr: Add chapter on USSD configuration Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 --- A OsmoHLR/chapters/ussd.adoc M OsmoHLR/osmohlr-usermanual.adoc 2 files changed, 80 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/OsmoHLR/chapters/ussd.adoc b/OsmoHLR/chapters/ussd.adoc new file mode 100644 index 0000000..be463ac --- /dev/null +++ b/OsmoHLR/chapters/ussd.adoc @@ -0,0 +1,78 @@ +[[ussd]] +== Unstructured Supplementary Services Data (USSD) + +The _Unstructured Supplementary Services Data (USSD)_ is one service within +2G/3G networks next to other services such as circuit-switched voice, packet-switched +data and SMS (Short Message Service). + +It is on an abstract level quite similar to SMS in that USSD can be used to send +textual messages. However, there are the following differences: + +* USSD is between the MS (phone) and an USSD application on the network, while + SMS is primarily between two subscribers identified by their MSISDN +* USSD is faster, as it doesn't suffer from the complicated three-layer CP/RP/TP + protocol stack of SMS with it's acknowledgement of the acknowledged acknowledgement. +* USSD is session-oriented, i.e. a dialogue/session between subscriber and application + can persist for the transfer of more than one message. The dedicated radio channel + on the RAN remains established throughout that dialogue. + +=== USSD in Osmocom + +Until August 2018, OsmoMSC contained some minimalistic internal USSD +handling with no +ability to attach/extend it with external USSD applications. + +From August 2018 onwards, OsmoMSC doesn't contain any internal USSD +handlers/applications anymore. Instead, all USSD is transported to/from +OsmoHLR via the GSUP protocol. + +OsmoHLR contains some intenal USSD handlers and can route USSD messages +to any number of external USSD entities (EUSEs). The EUSE also use GSUP +to communicate USSD from/to OsmoHLR. + +Each EUSE is identified by its name. The name consists of a single-word +string preceding a currently fixed ("-00-00-00-00-00-00") suffix. +There is no authentication between EUSE and OsmoHLR: Any client program +able to connect to the GSUP port of OsmoHLR can register as any EUSE +(name). + +NOTE:: We plan to remove the requirement for this suffix as soon as we +are done resolving all more important issues. + +=== USSD Configuration + +USSD configuration in OsmoHLR happens within the `hlr` VTY node. + +`euse foobar-00-00-00-00-00-00` defines an EUSE with the given name `foobar` + +`ussd route prefix *123 external foobar-00-00-00-00-00-00` installs a +prefix route to the named EUSE. All USSD short codes starting with *123 will be +routed to the named EUSE. + +`ussd route prefix *#100# internal own-msisdn` installs a prefix route +to the named internal USSD handler. There above command will restore +the old behavior, in which *#100# will return a text message containing +the subscribers own phone number. There is one other handler called +`own-imsi` which will return the IMSI instead of the MSISDN. + +`ussd default-route external foobar-00-00-00-00-00-00` installs a +default route to the named EUSE. This means that all USSD codes for +which no more specific route exists will be routed to the named EUSE. + +=== Example EUSE program + +We have provided an example EUSE developed in C language using existing +Osmocom libraries for GSUP protocol handling and USSD encoding/decoding. +It will register as `foobar` EUSE to OsmoHLR on localhost. You can run +it on a different machine by specifying e.g. `osmo-euse-demo 1.2.3.4 5678` +to make it connect to OsmoHLR on IP address 1.2.3.4 and GSUP/TCP port +5678. + +The idea is that you can use this as a template to develop your own USSD +applications, or any gateways to other protocols or interfaces. + +You can find it in `osmo-hlr/src/osmo-euse-demo.c` or online by +following the link to http://git.osmocom.org/osmo-hlr/tree/src/osmo-euse-demo.c + +This demonstration program will echo back any USSD message sent/routed +to it, quoted like _You sent "..."_. diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc index 043c971..d9a4654 100644 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ b/OsmoHLR/osmohlr-usermanual.adoc @@ -14,6 +14,8 @@ include::chapters/subscribers.adoc[] +include::chapters/ussd.adoc[] + include::../common/chapters/vty.adoc[] include::../common/chapters/logging.adoc[] -- To view, visit https://gerrit.osmocom.org/10363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie5196ece9f340303bcb4868e3333a9698e28c3d0 Gerrit-Change-Number: 10363 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:04:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:04:30 +0000 Subject: Change in simtrace2[master]: jenkins: add simtrace/trace to the builds In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10373 ) Change subject: jenkins: add simtrace/trace to the builds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I157fff9930d03a7ec52ecac4a1be0511ea66c010 Gerrit-Change-Number: 10373 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:04:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:04:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:04:31 +0000 Subject: Change in simtrace2[master]: jenkins: add simtrace/trace to the builds In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10373 ) Change subject: jenkins: add simtrace/trace to the builds ...................................................................... jenkins: add simtrace/trace to the builds trace is now stable enough on simtrace to be built and uploaded. Change-Id: I157fff9930d03a7ec52ecac4a1be0511ea66c010 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index bdf2b39..99a6f00 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -25,7 +25,7 @@ export LD_LIBRARY_PATH="$inst/lib" BUILDS="" -BUILDS+="simtrace/dfu simtrace/cardem " # simtrace/trace simtrace/triple_play +BUILDS+="simtrace/dfu simtrace/cardem simtrace/trace " # simtrace/triple_play BUILDS+="qmod/dfu qmod/cardem " BUILDS+="owhw/dfu owhw/cardem " -- To view, visit https://gerrit.osmocom.org/10373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I157fff9930d03a7ec52ecac4a1be0511ea66c010 Gerrit-Change-Number: 10373 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:08:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:08:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdow... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10374 ) Change subject: sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdown problems ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0cd1adf072f8ba40343e51e41f23a1de6a2bd62c Gerrit-Change-Number: 10374 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:08:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:08:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:08:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fill g_gb configs for the remaining Gb interfaces In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10375 ) Change subject: sgsn: fill g_gb configs for the remaining Gb interfaces ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7f56618110f04d99b1b43e69d89167e384b61a34 Gerrit-Change-Number: 10375 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:08:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:08:56 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 18:08:56 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10371 to look at the new patch set (#2). Change subject: bssgp: introduce flush queue functions ...................................................................... bssgp: introduce flush queue functions To reset the state of BSSGP allow to flush the BSSGP queues. When testing (with TTCN3) the test object should be resetted between each test. Introduce the functions: bssgp_fc_flush_queue() - flushs a single flow control object bssgp_flush_all_queues() - flushs queues of all BSSGP connections Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/libosmogb.map 3 files changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/10371/2 -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:10:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:10:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10376 ) Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... Patch Set 1: I would prefer if the NS_Emulation would get passed a record containing specific configuration values, like we do in the various other TTCN3 test suites. The magic with the "offset" an computing the various identifiers from that could then be done from the user/caller side when generating the configuration structure before creating the respective NS instances -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 07 Aug 2018 18:10:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:11:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:11:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce TC_attach_rau_a_a() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10380 ) Change subject: sgsn: introduce TC_attach_rau_a_a() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id76b4792c07816bcbe5e965f23c2b526df0923c3 Gerrit-Change-Number: 10380 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:11:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:12:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:12:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: create 3 instances of BSSGP at the same time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10378 ) Change subject: sgsn: create 3 instances of BSSGP at the same time ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10378/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/10378/1/sgsn/SGSN_Tests.ttcn at 222 PS1, Line 222: f_init_gb(g_gb[1], "SGSN_Test-Gb0", 1); shouldn't that be SGSN_Test-Gb1 and Gb2 in the name? -- To view, visit https://gerrit.osmocom.org/10378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf Gerrit-Change-Number: 10378 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:12:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:12:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:12:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdow... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10374 ) Change subject: sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdown problems ...................................................................... sgsn: f_pdp_ctx_deact_mt: rework test behaviour to workaround shutdown problems When introducing multiple BSSGP instances, this tests has problem when shutting down the test. Change-Id: I0cd1adf072f8ba40343e51e41f23a1de6a2bd62c --- M sgsn/SGSN_Tests.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 0a20dd6..ce796e8 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -979,11 +979,20 @@ } else { GTP.send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); } + + timer T := 5.0; + T.start; + alt { [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); } - [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { } + [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { + repeat; + } + [] T.timeout { + setverdict(fail, "Waiting for SM_DEACT_PDP_REQ_MT"); + } } } -- To view, visit https://gerrit.osmocom.org/10374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0cd1adf072f8ba40343e51e41f23a1de6a2bd62c Gerrit-Change-Number: 10374 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:13:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:13:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10392 ) Change subject: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 Gerrit-Change-Number: 10392 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:13:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:14:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:14:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce f_routing_area_update() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10379 ) Change subject: sgsn: introduce f_routing_area_update() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4064e013f73319f24bb893a9047c8b9eb7d6aac2 Gerrit-Change-Number: 10379 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:14:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:14:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:14:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: add type record LLC_Entities In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10382 ) Change subject: BSSGP_Emulation: add type record LLC_Entities ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a8c6a608c84a984e542510482bbfc5394ae6658 Gerrit-Change-Number: 10382 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:14:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:15:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:15:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: dont fail when removing a non-exitent client In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10385 ) Change subject: BSSGP_Emulation: dont fail when removing a non-exitent client ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibad8971e5acc2691da29cf7fa394d1d58eea79a4 Gerrit-Change-Number: 10385 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:15:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:15:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:15:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10384 ) Change subject: BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib910dec4a54e155573c162a70731f20cbf1e9c5d Gerrit-Change-Number: 10384 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:15:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:15:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:15:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add f_cellid_to_RAI() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10381 ) Change subject: sgsn: add f_cellid_to_RAI() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide96213ab2f210590b86deaf370486c8a0a78058 Gerrit-Change-Number: 10381 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:15:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:17:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:17:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: move LLC layer out of BSSGP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10383 ) Change subject: BSSGP_Emulation: move LLC layer out of BSSGP ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10383/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/10383/1/sgsn/SGSN_Tests.ttcn at 341 PS1, Line 341: function f_send_llc(template PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr { naming could include some mention of "l3" or "gmm" as it is not a function to be e.g. used to send user plane LLC messages. -- To view, visit https://gerrit.osmocom.org/10383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 Gerrit-Change-Number: 10383 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:17:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:17:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:17:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10386 ) Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:17:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:18:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:18:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce TC_attach_rau_a_b In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10387 ) Change subject: sgsn: introduce TC_attach_rau_a_b ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie636778628c216e315bd6f5bc11e0e5bd9c218a5 Gerrit-Change-Number: 10387 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:18:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:19:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:19:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix TC_attach_check_complete_resend In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10390 ) Change subject: sgsn: fix TC_attach_check_complete_resend ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3fa5c100b8389e184acf1e71e2792e5474c22dec Gerrit-Change-Number: 10390 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:19:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:19:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: increase the timeout of some TC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10389 ) Change subject: sgsn: increase the timeout of some TC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I12baf4b2425d0d862755d03d16127b18968e28f2 Gerrit-Change-Number: 10389 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:19:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:22:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 18:22:30 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10371/2/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/#/c/10371/2/src/gb/gprs_bssgp.c at 1282 PS2, Line 1282: connections contexts -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Aug 2018 18:22:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 18:23:46 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 7 Aug 2018 18:23:46 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10371 to look at the new patch set (#3). Change subject: bssgp: introduce flush queue functions ...................................................................... bssgp: introduce flush queue functions To reset the state of BSSGP allow to flush the BSSGP queues. When testing (with TTCN3) the test object should be resetted between each test. Introduce the functions: bssgp_fc_flush_queue() - flushs a single flow control object bssgp_flush_all_queues() - flushs queues of all BSSGP connections Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/libosmogb.map 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/10371/3 -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 21:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 21:06:55 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: avoid using CR and NL in IUSE responses In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10323 ) Change subject: hlr_ussd.c: avoid using CR and NL in IUSE responses ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee Gerrit-Change-Number: 10323 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 07 Aug 2018 21:06:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 21:08:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 7 Aug 2018 21:08:18 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: avoid using CR and NL in IUSE responses In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by Vadim Yanitskiy. ( https://gerrit.osmocom.org/10323 ) Change subject: hlr_ussd.c: avoid using CR and NL in IUSE responses ...................................................................... hlr_ussd.c: avoid using CR and NL in IUSE responses According to GSM TS 03.38, section 6.1.2.1, CR symbol at the end is optional, and moreover libosmogsm encoding API will carry about the bit padding itself. Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee --- M src/hlr_ussd.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/23/10323/2 -- To view, visit https://gerrit.osmocom.org/10323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee Gerrit-Change-Number: 10323 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 21:46:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 7 Aug 2018 21:46:44 +0000 Subject: Change in docker-playground[master]: OsmocomBB/Dockerfile: drop unneeded dependencies Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10393 Change subject: OsmocomBB/Dockerfile: drop unneeded dependencies ...................................................................... OsmocomBB/Dockerfile: drop unneeded dependencies Change-Id: I6804b4f6ee3b81e470d9e1514c34931a271a42bc --- M osmo-virtphy-master/Dockerfile M osmocom-bb-trxcon/Dockerfile 2 files changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/10393/1 diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile index d433318..3b464b1 100644 --- a/osmo-virtphy-master/Dockerfile +++ b/osmo-virtphy-master/Dockerfile @@ -13,13 +13,7 @@ ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ - libosmocore-dev \ - libosmo-abis-dev \ - libosmo-netif-dev \ - libosmo-sccp-dev \ - libsmpp34-dev \ - libgtp-dev && \ + libosmocore-dev && \ apt-get clean WORKDIR /tmp diff --git a/osmocom-bb-trxcon/Dockerfile b/osmocom-bb-trxcon/Dockerfile index 313b669..19cc772 100644 --- a/osmocom-bb-trxcon/Dockerfile +++ b/osmocom-bb-trxcon/Dockerfile @@ -15,7 +15,6 @@ ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ - tcpdump \ libosmocore-dev && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/10393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6804b4f6ee3b81e470d9e1514c34931a271a42bc Gerrit-Change-Number: 10393 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 21:46:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 7 Aug 2018 21:46:44 +0000 Subject: Change in docker-playground[master]: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10394 Change subject: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' ...................................................................... Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' At the moment, this Docker image does contain not only trxcon, but also FakeTRX, virt_phy, and other host applications, so let's name it properly... Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb --- M Makefile R osmocom-bb-host-master/.release R osmocom-bb-host-master/Dockerfile R osmocom-bb-host-master/Makefile R osmocom-bb-host-master/Release.key M ttcn3-bts-test/jenkins.sh 6 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/10394/1 diff --git a/Makefile b/Makefile index eca64be..2cdbc58 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,9 @@ osmo-stp-master: debian-jessie-build $(MAKE) -C osmo-stp-master -.PHONY: osmocom-bb-trxcon -osmocom-bb-trxcon: debian-jessie-build - $(MAKE) -C osmocom-bb-trxcon +.PHONY: osmocom-bb-host-master +osmocom-bb-host-master: debian-jessie-build + $(MAKE) -C osmocom-bb-host-master .PHONY: osmo-ggsn-master osmo-ggsn-master: debian-jessie-build @@ -38,7 +38,7 @@ $(MAKE) -C ttcn3-bsc-test .PHONY: ttcn3-bts-test -ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-trxcon ttcn3-bts-test +ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-host-master ttcn3-bts-test $(MAKE) -C ttcn3-bts-test .PHONY: ttcn3-msc-test diff --git a/osmocom-bb-trxcon/.release b/osmocom-bb-host-master/.release similarity index 100% rename from osmocom-bb-trxcon/.release rename to osmocom-bb-host-master/.release diff --git a/osmocom-bb-trxcon/Dockerfile b/osmocom-bb-host-master/Dockerfile similarity index 100% rename from osmocom-bb-trxcon/Dockerfile rename to osmocom-bb-host-master/Dockerfile diff --git a/osmocom-bb-trxcon/Makefile b/osmocom-bb-host-master/Makefile similarity index 100% rename from osmocom-bb-trxcon/Makefile rename to osmocom-bb-host-master/Makefile diff --git a/osmocom-bb-trxcon/Release.key b/osmocom-bb-host-master/Release.key similarity index 100% rename from osmocom-bb-trxcon/Release.key rename to osmocom-bb-host-master/Release.key diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index e8c77f3..1cd06e7 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -38,7 +38,7 @@ docker run --rm \ --network $NET_NAME --ip 172.18.9.21 \ --name ${BUILD_TAG}-fake_trx -d \ - $REPO_USER/osmocom-bb-trxcon \ + $REPO_USER/osmocom-bb-host-master \ /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 echo Starting container with trxcon @@ -46,7 +46,7 @@ --network $NET_NAME --ip 172.18.9.22 \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ - $REPO_USER/osmocom-bb-trxcon \ + $REPO_USER/osmocom-bb-host-master \ /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 -- To view, visit https://gerrit.osmocom.org/10394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb Gerrit-Change-Number: 10394 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 21:46:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 7 Aug 2018 21:46:45 +0000 Subject: Change in docker-playground[master]: OsmocomBB: remove unused 'osmo-virtphy-master' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10395 Change subject: OsmocomBB: remove unused 'osmo-virtphy-master' ...................................................................... OsmocomBB: remove unused 'osmo-virtphy-master' There is no need to keep an additional Docker image with the same project, and virt_phy can be compiled as a part of the main image ('osmocom-bb-host-master'). Moreover, virt_phy is not used at the moment, so let's remove this. Change-Id: Ifafb044e8350177e60b479b77c8aad78505eabbc --- D osmo-virtphy-master/.release D osmo-virtphy-master/Dockerfile D osmo-virtphy-master/Makefile D osmo-virtphy-master/Release.key 4 files changed, 0 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/10395/1 diff --git a/osmo-virtphy-master/.release b/osmo-virtphy-master/.release deleted file mode 100644 index 8be66cb..0000000 --- a/osmo-virtphy-master/.release +++ /dev/null @@ -1,2 +0,0 @@ -release=0.0.0 -tag=osmo-virtphy-master-0.0.0 diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile deleted file mode 100644 index 3b464b1..0000000 --- a/osmo-virtphy-master/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM laforge/debian-jessie-build - -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" - -COPY Release.key /tmp/Release.key - -RUN apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list - -ADD $OSMOCOM_REPO/Release /tmp/Release -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - libosmocore-dev && \ - apt-get clean - -WORKDIR /tmp - -ARG OSMO_BB_BRANCH="master" - -RUN git clone git://git.osmocom.org/osmocom-bb.git -ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit - -RUN cd osmocom-bb/src/host/virt_phy && \ - git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \ - autoreconf -fi && \ - ./configure && \ - make -j8 install - -VOLUME /data - -WORKDIR /data -CMD ["/usr/local/sbin/virtphy","-s","/data/osmocom_l2"] - -#EXPOSE 3002/tcp 3003/tcp 4242/tcp 2775/tcp 4249/tcp diff --git a/osmo-virtphy-master/Makefile b/osmo-virtphy-master/Makefile deleted file mode 100644 index 2aba67b..0000000 --- a/osmo-virtphy-master/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.231 -v virtphy-vol:/data - -include ../make/Makefile diff --git a/osmo-virtphy-master/Release.key b/osmo-virtphy-master/Release.key deleted file mode 100644 index e656238..0000000 --- a/osmo-virtphy-master/Release.key +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc -a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl -CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 -5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee -S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y -CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy -b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc -aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI -ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw -8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI -L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb -/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I -ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi -8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v -d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= -=Gvly ------END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/10395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifafb044e8350177e60b479b77c8aad78505eabbc Gerrit-Change-Number: 10395 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 22:14:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 7 Aug 2018 22:14:10 +0000 Subject: Change in docker-playground[master]: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10394 ) Change subject: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' ...................................................................... Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' At the moment, this Docker image does contain not only trxcon, but also FakeTRX, virt_phy, and other host applications, so let's name it properly... Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb --- M Makefile A osmocom-bb-host-master/.release R osmocom-bb-host-master/Dockerfile R osmocom-bb-host-master/Makefile R osmocom-bb-host-master/Release.key D osmocom-bb-trxcon/.release M ttcn3-bts-test/jenkins.sh 7 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/10394/2 -- To view, visit https://gerrit.osmocom.org/10394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb Gerrit-Change-Number: 10394 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 7 22:14:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 7 Aug 2018 22:14:10 +0000 Subject: Change in docker-playground[master]: OsmocomBB: remove unused 'osmo-virtphy-master' In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10395 ) Change subject: OsmocomBB: remove unused 'osmo-virtphy-master' ...................................................................... OsmocomBB: remove unused 'osmo-virtphy-master' There is no need to keep an additional Docker image with the same project, because virt_phy can be compiled as a part of the main image ('osmocom-bb-host-master'). Moreover, virt_phy is not used at the moment, so let's remove this. Change-Id: Ifafb044e8350177e60b479b77c8aad78505eabbc --- D osmo-virtphy-master/.release D osmo-virtphy-master/Dockerfile D osmo-virtphy-master/Makefile D osmo-virtphy-master/Release.key 4 files changed, 0 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/10395/2 -- To view, visit https://gerrit.osmocom.org/10395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifafb044e8350177e60b479b77c8aad78505eabbc Gerrit-Change-Number: 10395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 05:56:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 05:56:08 +0000 Subject: Change in osmo-ci[master]: coverity: Re-order builds to ensure osmo-hlr before osmo-msc Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10396 Change subject: coverity: Re-order builds to ensure osmo-hlr before osmo-msc ...................................................................... coverity: Re-order builds to ensure osmo-hlr before osmo-msc osmo-msc now needs libosmo-gsup-client, which is built+installed as part of osmo-hlr Change-Id: I581d86cf9679ef978a018a5ba8deb8b0f034677b --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/96/10396/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 18c9b0b..920c0b9 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -79,8 +79,8 @@ build_osmobts build_default osmo-mgw build_default osmo-bsc -build_default osmo-msc build_default osmo-hlr +build_default osmo-msc build_default osmo-sgsn # GMR -- To view, visit https://gerrit.osmocom.org/10396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I581d86cf9679ef978a018a5ba8deb8b0f034677b Gerrit-Change-Number: 10396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 05:56:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 05:56:48 +0000 Subject: Change in osmo-ci[master]: coverity: Re-order builds to ensure osmo-hlr before osmo-msc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10396 ) Change subject: coverity: Re-order builds to ensure osmo-hlr before osmo-msc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I581d86cf9679ef978a018a5ba8deb8b0f034677b Gerrit-Change-Number: 10396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 05:56:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 05:56:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 05:56:50 +0000 Subject: Change in osmo-ci[master]: coverity: Re-order builds to ensure osmo-hlr before osmo-msc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10396 ) Change subject: coverity: Re-order builds to ensure osmo-hlr before osmo-msc ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I581d86cf9679ef978a018a5ba8deb8b0f034677b Gerrit-Change-Number: 10396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 05:56:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 05:56:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 05:56:51 +0000 Subject: Change in osmo-ci[master]: coverity: Re-order builds to ensure osmo-hlr before osmo-msc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10396 ) Change subject: coverity: Re-order builds to ensure osmo-hlr before osmo-msc ...................................................................... coverity: Re-order builds to ensure osmo-hlr before osmo-msc osmo-msc now needs libosmo-gsup-client, which is built+installed as part of osmo-hlr Change-Id: I581d86cf9679ef978a018a5ba8deb8b0f034677b --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 18c9b0b..920c0b9 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -79,8 +79,8 @@ build_osmobts build_default osmo-mgw build_default osmo-bsc -build_default osmo-msc build_default osmo-hlr +build_default osmo-msc build_default osmo-sgsn # GMR -- To view, visit https://gerrit.osmocom.org/10396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I581d86cf9679ef978a018a5ba8deb8b0f034677b Gerrit-Change-Number: 10396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:02:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:02:34 +0000 Subject: Change in osmo-gsm-tester[master]: jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10397 Change subject: jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc ...................................................................... jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc osmo-msc now needs libosmo-gsup-client, which is built during omso-hlr compilation. Change-Id: I67c5d168011a385fd4f68df351e0a93e9bef37a7 --- M contrib/jenkins-build-osmo-msc.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/10397/1 diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index 28d327b..5b5d1f6 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -10,6 +10,7 @@ build_repo libsmpp34 --enable-sanitize build_repo libosmo-sccp --enable-sanitize build_repo osmo-mgw --enable-sanitize +build_repo osmo-hlr --enable-sanitize build_repo osmo-msc --enable-sanitize --enable-smpp --disable-iu create_bin_tgz osmo-msc -- To view, visit https://gerrit.osmocom.org/10397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I67c5d168011a385fd4f68df351e0a93e9bef37a7 Gerrit-Change-Number: 10397 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:05:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:05:37 +0000 Subject: Change in osmo-ci[master]: osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10398 Change subject: osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter ...................................................................... osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter For some reason almost all projects allow to permit building a specific non-master branch, only osmo-hlr was missing that parameter. Untested. Change-Id: Ia4199aa5cfd1f39d34ed7c6104881c68d00dcffa --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/98/10398/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index ac1e868..748062d 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -83,6 +83,8 @@ - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_msc - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_osmo_hlr + - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_pcu - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_trx -- To view, visit https://gerrit.osmocom.org/10398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4199aa5cfd1f39d34ed7c6104881c68d00dcffa Gerrit-Change-Number: 10398 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:17:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:17:41 +0000 Subject: Change in osmo-gsm-tester[master]: jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10397 ) Change subject: jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I67c5d168011a385fd4f68df351e0a93e9bef37a7 Gerrit-Change-Number: 10397 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Aug 2018 06:17:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:17:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:17:42 +0000 Subject: Change in osmo-gsm-tester[master]: jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10397 ) Change subject: jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc ...................................................................... jenkins-build-osmo-msc.sh: Build osmo-hlr before osmo-msc osmo-msc now needs libosmo-gsup-client, which is built during omso-hlr compilation. Change-Id: I67c5d168011a385fd4f68df351e0a93e9bef37a7 --- M contrib/jenkins-build-osmo-msc.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index 28d327b..5b5d1f6 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -10,6 +10,7 @@ build_repo libsmpp34 --enable-sanitize build_repo libosmo-sccp --enable-sanitize build_repo osmo-mgw --enable-sanitize +build_repo osmo-hlr --enable-sanitize build_repo osmo-msc --enable-sanitize --enable-smpp --disable-iu create_bin_tgz osmo-msc -- To view, visit https://gerrit.osmocom.org/10397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I67c5d168011a385fd4f68df351e0a93e9bef37a7 Gerrit-Change-Number: 10397 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:18:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:18:20 +0000 Subject: Change in docker-playground[master]: OsmocomBB/Dockerfile: drop unneeded dependencies In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10393 ) Change subject: OsmocomBB/Dockerfile: drop unneeded dependencies ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6804b4f6ee3b81e470d9e1514c34931a271a42bc Gerrit-Change-Number: 10393 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 06:18:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:18:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:18:56 +0000 Subject: Change in docker-playground[master]: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10394 ) Change subject: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb Gerrit-Change-Number: 10394 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 06:18:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:19:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:19:31 +0000 Subject: Change in docker-playground[master]: OsmocomBB: remove unused 'osmo-virtphy-master' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10395 ) Change subject: OsmocomBB: remove unused 'osmo-virtphy-master' ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifafb044e8350177e60b479b77c8aad78505eabbc Gerrit-Change-Number: 10395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 06:19:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:19:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:19:32 +0000 Subject: Change in docker-playground[master]: OsmocomBB/Dockerfile: drop unneeded dependencies In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10393 ) Change subject: OsmocomBB/Dockerfile: drop unneeded dependencies ...................................................................... OsmocomBB/Dockerfile: drop unneeded dependencies Change-Id: I6804b4f6ee3b81e470d9e1514c34931a271a42bc --- M osmo-virtphy-master/Dockerfile M osmocom-bb-trxcon/Dockerfile 2 files changed, 1 insertion(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile index d433318..3b464b1 100644 --- a/osmo-virtphy-master/Dockerfile +++ b/osmo-virtphy-master/Dockerfile @@ -13,13 +13,7 @@ ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ - telnet \ - libosmocore-dev \ - libosmo-abis-dev \ - libosmo-netif-dev \ - libosmo-sccp-dev \ - libsmpp34-dev \ - libgtp-dev && \ + libosmocore-dev && \ apt-get clean WORKDIR /tmp diff --git a/osmocom-bb-trxcon/Dockerfile b/osmocom-bb-trxcon/Dockerfile index 313b669..19cc772 100644 --- a/osmocom-bb-trxcon/Dockerfile +++ b/osmocom-bb-trxcon/Dockerfile @@ -15,7 +15,6 @@ ADD $OSMOCOM_REPO/Release /tmp/Release RUN apt-get update && \ apt-get install -y --no-install-recommends \ - tcpdump \ libosmocore-dev && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/10393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6804b4f6ee3b81e470d9e1514c34931a271a42bc Gerrit-Change-Number: 10393 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:19:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:19:33 +0000 Subject: Change in docker-playground[master]: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10394 ) Change subject: Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' ...................................................................... Rename 'osmocom-bb-trxcon' to 'osmocom-bb-host-master' At the moment, this Docker image does contain not only trxcon, but also FakeTRX, virt_phy, and other host applications, so let's name it properly... Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb --- M Makefile A osmocom-bb-host-master/.release R osmocom-bb-host-master/Dockerfile R osmocom-bb-host-master/Makefile R osmocom-bb-host-master/Release.key D osmocom-bb-trxcon/.release M ttcn3-bts-test/jenkins.sh 7 files changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/Makefile b/Makefile index eca64be..2cdbc58 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,9 @@ osmo-stp-master: debian-jessie-build $(MAKE) -C osmo-stp-master -.PHONY: osmocom-bb-trxcon -osmocom-bb-trxcon: debian-jessie-build - $(MAKE) -C osmocom-bb-trxcon +.PHONY: osmocom-bb-host-master +osmocom-bb-host-master: debian-jessie-build + $(MAKE) -C osmocom-bb-host-master .PHONY: osmo-ggsn-master osmo-ggsn-master: debian-jessie-build @@ -38,7 +38,7 @@ $(MAKE) -C ttcn3-bsc-test .PHONY: ttcn3-bts-test -ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-trxcon ttcn3-bts-test +ttcn3-bts-test: debian-stretch-titan osmo-bsc-master osmo-bts-master osmocom-bb-host-master ttcn3-bts-test $(MAKE) -C ttcn3-bts-test .PHONY: ttcn3-msc-test diff --git a/osmocom-bb-host-master/.release b/osmocom-bb-host-master/.release new file mode 100644 index 0000000..0432acd --- /dev/null +++ b/osmocom-bb-host-master/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmocom-bb-host-master-0.0.0 diff --git a/osmocom-bb-trxcon/Dockerfile b/osmocom-bb-host-master/Dockerfile similarity index 100% rename from osmocom-bb-trxcon/Dockerfile rename to osmocom-bb-host-master/Dockerfile diff --git a/osmocom-bb-trxcon/Makefile b/osmocom-bb-host-master/Makefile similarity index 100% rename from osmocom-bb-trxcon/Makefile rename to osmocom-bb-host-master/Makefile diff --git a/osmocom-bb-trxcon/Release.key b/osmocom-bb-host-master/Release.key similarity index 100% rename from osmocom-bb-trxcon/Release.key rename to osmocom-bb-host-master/Release.key diff --git a/osmocom-bb-trxcon/.release b/osmocom-bb-trxcon/.release deleted file mode 100644 index a6e882a..0000000 --- a/osmocom-bb-trxcon/.release +++ /dev/null @@ -1,2 +0,0 @@ -release=0.0.0 -tag=osmocombb-bb-trxcon-0.0.0 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index e8c77f3..1cd06e7 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -38,7 +38,7 @@ docker run --rm \ --network $NET_NAME --ip 172.18.9.21 \ --name ${BUILD_TAG}-fake_trx -d \ - $REPO_USER/osmocom-bb-trxcon \ + $REPO_USER/osmocom-bb-host-master \ /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py -R 172.18.9.20 -r 172.18.9.22 echo Starting container with trxcon @@ -46,7 +46,7 @@ --network $NET_NAME --ip 172.18.9.22 \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-trxcon -d \ - $REPO_USER/osmocom-bb-trxcon \ + $REPO_USER/osmocom-bb-host-master \ /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 -- To view, visit https://gerrit.osmocom.org/10394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ieba2411230efdedc13afcd62b8b3a2153fbaf0cb Gerrit-Change-Number: 10394 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:19:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:19:34 +0000 Subject: Change in docker-playground[master]: OsmocomBB: remove unused 'osmo-virtphy-master' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10395 ) Change subject: OsmocomBB: remove unused 'osmo-virtphy-master' ...................................................................... OsmocomBB: remove unused 'osmo-virtphy-master' There is no need to keep an additional Docker image with the same project, because virt_phy can be compiled as a part of the main image ('osmocom-bb-host-master'). Moreover, virt_phy is not used at the moment, so let's remove this. Change-Id: Ifafb044e8350177e60b479b77c8aad78505eabbc --- D osmo-virtphy-master/.release D osmo-virtphy-master/Dockerfile D osmo-virtphy-master/Makefile D osmo-virtphy-master/Release.key 4 files changed, 0 insertions(+), 62 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-virtphy-master/.release b/osmo-virtphy-master/.release deleted file mode 100644 index 8be66cb..0000000 --- a/osmo-virtphy-master/.release +++ /dev/null @@ -1,2 +0,0 @@ -release=0.0.0 -tag=osmo-virtphy-master-0.0.0 diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile deleted file mode 100644 index 3b464b1..0000000 --- a/osmo-virtphy-master/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM laforge/debian-jessie-build - -MAINTAINER Harald Welte - -ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/" - -COPY Release.key /tmp/Release.key - -RUN apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list - -ADD $OSMOCOM_REPO/Release /tmp/Release -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - libosmocore-dev && \ - apt-get clean - -WORKDIR /tmp - -ARG OSMO_BB_BRANCH="master" - -RUN git clone git://git.osmocom.org/osmocom-bb.git -ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit - -RUN cd osmocom-bb/src/host/virt_phy && \ - git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \ - autoreconf -fi && \ - ./configure && \ - make -j8 install - -VOLUME /data - -WORKDIR /data -CMD ["/usr/local/sbin/virtphy","-s","/data/osmocom_l2"] - -#EXPOSE 3002/tcp 3003/tcp 4242/tcp 2775/tcp 4249/tcp diff --git a/osmo-virtphy-master/Makefile b/osmo-virtphy-master/Makefile deleted file mode 100644 index 2aba67b..0000000 --- a/osmo-virtphy-master/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.231 -v virtphy-vol:/data - -include ../make/Makefile diff --git a/osmo-virtphy-master/Release.key b/osmo-virtphy-master/Release.key deleted file mode 100644 index e656238..0000000 --- a/osmo-virtphy-master/Release.key +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc -a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl -CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 -5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee -S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y -CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy -b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc -aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI -ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw -8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI -L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb -/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I -ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi -8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v -d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= -=Gvly ------END PGP PUBLIC KEY BLOCK----- -- To view, visit https://gerrit.osmocom.org/10395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifafb044e8350177e60b479b77c8aad78505eabbc Gerrit-Change-Number: 10395 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:21:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:21:24 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: avoid using CR and NL in IUSE responses In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10323 ) Change subject: hlr_ussd.c: avoid using CR and NL in IUSE responses ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee Gerrit-Change-Number: 10323 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 08 Aug 2018 06:21:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:21:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:21:26 +0000 Subject: Change in osmo-hlr[master]: hlr_ussd.c: avoid using CR and NL in IUSE responses In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10323 ) Change subject: hlr_ussd.c: avoid using CR and NL in IUSE responses ...................................................................... hlr_ussd.c: avoid using CR and NL in IUSE responses According to GSM TS 03.38, section 6.1.2.1, CR symbol at the end is optional, and moreover libosmogsm encoding API will carry about the bit padding itself. Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee --- M src/hlr_ussd.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 7b981bb..4ec9825 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -297,7 +297,7 @@ if (strlen(subscr.msisdn) == 0) snprintf(buf, sizeof(buf), "You have no MSISDN!"); else - snprintf(buf, sizeof(buf), "Your extension is %s\r", subscr.msisdn); + snprintf(buf, sizeof(buf), "Your extension is %s", subscr.msisdn); ss_tx_ussd_7bit(ss, true, req->invoke_id, buf); break; case -ENOENT: @@ -315,7 +315,7 @@ const struct osmo_gsup_message *gsup, const struct ss_request *req) { char buf[GSM0480_USSD_7BIT_STRING_LEN+1]; - snprintf(buf, sizeof(buf), "Your IMSI is %s!\n", ss->imsi); + snprintf(buf, sizeof(buf), "Your IMSI is %s", ss->imsi); ss_tx_ussd_7bit(ss, true, req->invoke_id, buf); return 0; } -- To view, visit https://gerrit.osmocom.org/10323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I09e8a67758698f3b7a578eab956311e269d091ee Gerrit-Change-Number: 10323 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:29:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:29:17 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Fix libusrp and other non-osmocom builds Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10399 Change subject: osmocom-latest-packages: Fix libusrp and other non-osmocom builds ...................................................................... osmocom-latest-packages: Fix libusrp and other non-osmocom builds We're using the build() function not only to build osmocom projects requiring a .tarball-version file, but also other projects such as libusrp. Let's make the related git-buildpackage arguments conditional to whether or not a .tarball-version file exists at all. Change-Id: I0683cff036a240b1b819f91fbd230d5f9211074c --- M scripts/osmocom-latest-packages.sh 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/99/10399/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 1d122aa..83ab084 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -34,10 +34,15 @@ git fetch VER=$(git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1) git checkout -f -B "$VER" "refs/tags/$VER" - test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null - gbp buildpackage -d -S -uc -us "--git-export-dir=$output" "--git-debian-branch=$VER" \ - --git-ignore-new \ - --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + if [ -x ./git-version-gen ]; then + ./git-version-gen . > .tarball-version 2>/dev/null + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + else + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new + fi if [ ! -d "$TOP/$PROJ/$1" ] ; then # creating a new package is different from using old ones -- To view, visit https://gerrit.osmocom.org/10399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0683cff036a240b1b819f91fbd230d5f9211074c Gerrit-Change-Number: 10399 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:29:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:29:42 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Fix libusrp and other non-osmocom builds In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10399 ) Change subject: osmocom-latest-packages: Fix libusrp and other non-osmocom builds ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0683cff036a240b1b819f91fbd230d5f9211074c Gerrit-Change-Number: 10399 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 06:29:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:29:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:29:43 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Fix libusrp and other non-osmocom builds In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10399 ) Change subject: osmocom-latest-packages: Fix libusrp and other non-osmocom builds ...................................................................... osmocom-latest-packages: Fix libusrp and other non-osmocom builds We're using the build() function not only to build osmocom projects requiring a .tarball-version file, but also other projects such as libusrp. Let's make the related git-buildpackage arguments conditional to whether or not a .tarball-version file exists at all. Change-Id: I0683cff036a240b1b819f91fbd230d5f9211074c --- M scripts/osmocom-latest-packages.sh 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 1d122aa..83ab084 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -34,10 +34,15 @@ git fetch VER=$(git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1) git checkout -f -B "$VER" "refs/tags/$VER" - test -x ./git-version-gen && ./git-version-gen . > .tarball-version 2>/dev/null - gbp buildpackage -d -S -uc -us "--git-export-dir=$output" "--git-debian-branch=$VER" \ - --git-ignore-new \ - --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + if [ -x ./git-version-gen ]; then + ./git-version-gen . > .tarball-version 2>/dev/null + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new \ + --git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/' + else + gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \ + "--git-debian-branch=$VER" --git-ignore-new + fi if [ ! -d "$TOP/$PROJ/$1" ] ; then # creating a new package is different from using old ones -- To view, visit https://gerrit.osmocom.org/10399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0683cff036a240b1b819f91fbd230d5f9211074c Gerrit-Change-Number: 10399 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 06:59:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 06:59:15 +0000 Subject: Change in osmo-hlr[master]: USSD: Fix "ussd default-route" Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10400 Change subject: USSD: Fix "ussd default-route" ...................................................................... USSD: Fix "ussd default-route" Before this patch, the default route logic was not implemented. The user could specify a default-route, but it wouldn't be used by the actual routing logic. Let's fix that. Change-Id: I0b04a75dc297f088f13da413d08c52e0747e46e6 --- M src/hlr_ussd.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/00/10400/1 diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 4ec9825..c96f47c 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -507,6 +507,11 @@ ss->is_external = false; ss->u.iuse = rt->u.iuse; } + } else { + if (hlr->euse_default) { + ss->is_external = true; + ss->u.euse = hlr->euse_default; + } } } /* dispatch unstructured SS to routing */ -- To view, visit https://gerrit.osmocom.org/10400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0b04a75dc297f088f13da413d08c52e0747e46e6 Gerrit-Change-Number: 10400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 07:11:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 07:11:56 +0000 Subject: Change in osmo-hlr[master]: USSD: Fix "ussd default-route" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10400 ) Change subject: USSD: Fix "ussd default-route" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0b04a75dc297f088f13da413d08c52e0747e46e6 Gerrit-Change-Number: 10400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Aug 2018 07:11:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 07:11:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 07:11:58 +0000 Subject: Change in osmo-hlr[master]: USSD: Fix "ussd default-route" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10400 ) Change subject: USSD: Fix "ussd default-route" ...................................................................... USSD: Fix "ussd default-route" Before this patch, the default route logic was not implemented. The user could specify a default-route, but it wouldn't be used by the actual routing logic. Let's fix that. Change-Id: I0b04a75dc297f088f13da413d08c52e0747e46e6 --- M src/hlr_ussd.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 4ec9825..c96f47c 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -507,6 +507,11 @@ ss->is_external = false; ss->u.iuse = rt->u.iuse; } + } else { + if (hlr->euse_default) { + ss->is_external = true; + ss->u.euse = hlr->euse_default; + } } } /* dispatch unstructured SS to routing */ -- To view, visit https://gerrit.osmocom.org/10400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0b04a75dc297f088f13da413d08c52e0747e46e6 Gerrit-Change-Number: 10400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:03:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:03:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: move USSD_Helpers.ttcn to library Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10401 Change subject: move USSD_Helpers.ttcn to library ...................................................................... move USSD_Helpers.ttcn to library We want to use those also from the HLR_Tests, not just from MSC_Tests. Change-Id: I22be6c03d85dc6d6a8266b5ebce5d0c69c0551ed --- R library/USSD_Helpers.ttcn M msc/gen_links.sh 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/10401/1 diff --git a/msc/USSD_Helpers.ttcn b/library/USSD_Helpers.ttcn similarity index 100% rename from msc/USSD_Helpers.ttcn rename to library/USSD_Helpers.ttcn diff --git a/msc/gen_links.sh b/msc/gen_links.sh index d8a7d22..a191aa5 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -90,7 +90,7 @@ FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " -FILES+="SS_Templates.ttcn SCCP_Templates.ttcn" +FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/10401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I22be6c03d85dc6d6a8266b5ebce5d0c69c0551ed Gerrit-Change-Number: 10401 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:03:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:03:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Link required libraries for USSD / SS messages Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10402 Change subject: hlr: Link required libraries for USSD / SS messages ...................................................................... hlr: Link required libraries for USSD / SS messages Change-Id: I4501a4843b412dc06051c5e037764e581de1977a --- M hlr/gen_links.sh M hlr/regen_makefile.sh 2 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/10402/1 diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index 1e98cb2..f9e80c5 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -5,8 +5,8 @@ . ../gen_links.sh.inc DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src -FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc -TCCInterface.cc TCCInterface_ip.h" +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src @@ -21,10 +21,26 @@ FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.ROSE/src +FILES="Remote_Operations_Generic_ROS_PDUs.asn Remote_Operations_Information_Objects.asn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MAP/src +FILES="MAP_ApplicationContexts.asn MAP_CH_DataTypes.asn MAP_CallHandlingOperations.asn MAP_CommonDataTypes.asn MAP_DialogueInformation.asn MAP_ER_DataTypes.asn MAP_EncDec.cc MAP_Errors.asn MAP_GR_DataTypes.asn MAP_Group_Call_Operations.asn MAP_LCS_DataTypes.asn MAP_LocationServiceOperations.asn MAP_MS_DataTypes.asn MAP_MobileServiceOperations.asn MAP_OM_DataTypes.asn MAP_OperationAndMaintenanceOperations.asn MAP_PDU_Defs.asn MAP_Protocol.asn MAP_SM_DataTypes.asn MAP_SS_Code.asn MAP_SS_DataTypes.asn MAP_ShortMessageServiceOperations.asn MAP_SupplementaryServiceOperations.asn MAP_TS_Code.asn MAP_Types.ttcn " +FILES+="MAP_BS_Code.asn MAP_ExtensionDataTypes.asn MobileDomainDefinitions.asn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src +FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn " +FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" +gen_links $DIR $FILES + DIR=../library FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " +FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " + gen_links $DIR $FILES diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 56f6671..1a1d812 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -2,7 +2,7 @@ MAIN="HLR_Tests.ttcn" -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc" +FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc TCCEncoding.cc SS_EncDec.cc MAP_EncDec.cc *.asn" export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL" -- To view, visit https://gerrit.osmocom.org/10402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4501a4843b412dc06051c5e037764e581de1977a Gerrit-Change-Number: 10402 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:03:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:03:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10403 Change subject: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity ...................................................................... HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity As OsmoHLR is getting support for external USSD Entities (EUSEs), we have to implement this function in the test logic in order to test it. Change-Id: Ibab210b06abfd5a21e81c7f7fbe574c4f67414a0 --- A hlr/HLR_EUSE.ttcn 1 file changed, 124 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/10403/1 diff --git a/hlr/HLR_EUSE.ttcn b/hlr/HLR_EUSE.ttcn new file mode 100644 index 0000000..1e7574b --- /dev/null +++ b/hlr/HLR_EUSE.ttcn @@ -0,0 +1,124 @@ +/* Simple / General implementation of an External USSD Entity using OsmoHLR's GSUP Protocol + * + * The idea is that a test case can simply start an instance of this component in parallel to its + * normal test components. HLR_EUSE_CT will then connect via GSUP to the HLR as the specified EUSE + * name. Any USSD related GSUP message received will be passed to a user-provided call-back + * function, which will return whatever PDU to send in response back to the HLR. + */ + +/* (C) 2018 by Harald Welte */ + +module HLR_EUSE { + +import from GSUP_Types all; +import from IPA_Emulation all; + +import from General_Types all; +import from Osmocom_Types all; +import from SS_Types all; +import from SS_Templates all; + +/* emulating an external USSD Entity towards OsmoHLR */ +type component HLR_EUSE_CT { + /* Component reference + config of underlying IPA emulation */ + var IPA_Emulation_CT vc_IPA_EUSE; + var IPA_CCM_Parameters ccm_pars; + /* port towards the underlying IPA emulation */ + port IPA_GSUP_PT EUSE; +} + +private function f_init(charstring hlr_ip, uint16_t hlr_gsup_port, charstring name) runs on HLR_EUSE_CT { + var charstring id := "EUSE-" & name; + ccm_pars := c_IPA_default_ccm_pars; + ccm_pars.name := "Osmocom TTCN-3 EUSE Simulator"; + ccm_pars.ser_nr := id; + + vc_IPA_EUSE := IPA_Emulation_CT.create("IPA-" & id); + map(vc_IPA_EUSE:IPA_PORT, system:IPA_CODEC_PT); + connect(vc_IPA_EUSE:IPA_GSUP_PORT, self:EUSE); + vc_IPA_EUSE.start(IPA_Emulation.main_client(hlr_ip, hlr_gsup_port, "", 0, ccm_pars)); + + timer T := 10.0; + T.start; + alt { + [] EUSE.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) { repeat; } + [] EUSE.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { } + [] T.timeout { + setverdict(fail, "EUSE: Timeout waiting for GSUP IPA Link to come up"); + self.stop; + } + } +} + +type function f_euse_cb(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU; + +function f_ss_echo_continue(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { + var GSUP_SessionState ss_next_state; + var GSUP_IeValue ss_ie; + var SS_FacilityInformation dec_fac, rsp_fac; + var octetstring ss_rsp; + + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); + dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); + log("dec_fac: ", dec_fac); + rsp_fac := valueof(ts_SS_USSD_FACILITY_RETURN_RESULT(dec_fac[0].invoke.invokeId.present_, + SS_OP_CODE_PROCESS_USS_REQ, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_DataCodingScheme, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_String)); + ss_rsp := enc_SS_FacilityInformation(rsp_fac); + select (ss_state) { + case (OSMO_GSUP_SESSION_STATE_BEGIN) { ss_next_state := OSMO_GSUP_SESSION_STATE_CONTINUE; } + case (OSMO_GSUP_SESSION_STATE_CONTINUE) { ss_next_state := OSMO_GSUP_SESSION_STATE_END; } + } + return valueof(ts_GSUP_PROC_SS_RES(rx_pdu.ies[0].val.imsi, rx_pdu.ies[1].val.session_id, + ss_next_state, ss_rsp)); +} + +function f_ss_echo(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { + var GSUP_IeValue ss_ie; + var SS_FacilityInformation dec_fac, rsp_fac; + var octetstring ss_rsp; + + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); + dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); + log("dec_fac: ", dec_fac); + rsp_fac := valueof(ts_SS_USSD_FACILITY_RETURN_RESULT(dec_fac[0].invoke.invokeId.present_, + SS_OP_CODE_PROCESS_USS_REQ, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_DataCodingScheme, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_String)); + ss_rsp := enc_SS_FacilityInformation(rsp_fac); + return valueof(ts_GSUP_PROC_SS_RES(rx_pdu.ies[0].val.imsi, rx_pdu.ies[1].val.session_id, + OSMO_GSUP_SESSION_STATE_END, ss_rsp)); +} + +/* main function for handling mobile-originated USSD via GSUP */ +function f_main_mo(charstring hlr_ip, uint16_t hlr_gsup_port, charstring name, f_euse_cb cb_fn) +runs on HLR_EUSE_CT { + var GSUP_PDU rx_pdu, tx_pdu; + + f_init(hlr_ip, hlr_gsup_port, name); + + while (true) { + alt { + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_BEGIN)) -> value rx_pdu { + EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_BEGIN, rx_pdu)); + } + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_CONTINUE)) -> value rx_pdu { + EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_CONTINUE, rx_pdu)); + } + + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_END)) -> value rx_pdu { + EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_END, rx_pdu)); + } + + + [] EUSE.receive { + setverdict(fail, "EUSE: Unexpected Rx from HLR"); + self.stop; + } + } + } +} + + +} -- To view, visit https://gerrit.osmocom.org/10403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibab210b06abfd5a21e81c7f7fbe574c4f67414a0 Gerrit-Change-Number: 10403 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:03:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:03:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: actually register simulated MSC as "MSC" identity to HLR Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10404 Change subject: hlr: actually register simulated MSC as "MSC" identity to HLR ...................................................................... hlr: actually register simulated MSC as "MSC" identity to HLR Change-Id: I3b6dc719318db8aef960f3249c16c20deb5793a7 --- M hlr/HLR_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/10404/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 753f92e..2bf5e57 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -103,6 +103,7 @@ ccm_pars := c_IPA_default_ccm_pars; ccm_pars.name := "Osmocom TTCN-3 GSUP Simulator"; + ccm_pars.ser_nr := "MSC-00-00-00-00-00-00"; vc_IPA := IPA_Emulation_CT.create(id & "-IPA"); log("legacy= ", legacy); -- To view, visit https://gerrit.osmocom.org/10404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b6dc719318db8aef960f3249c16c20deb5793a7 Gerrit-Change-Number: 10404 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:03:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:03:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Actual USSD test cases Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10405 Change subject: HLR: Actual USSD test cases ...................................................................... HLR: Actual USSD test cases Change-Id: I74a3419140179b1625e82d1298864e424fb81398 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 349 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/10405/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 2bf5e57..29af522 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -8,6 +8,12 @@ import from Osmocom_Types all; import from Osmocom_CTRL_Adapter all; +import from TCCEncoding_Functions all; +import from SS_Types all; +import from SS_Templates all; +import from MAP_Errors all; +import from USSD_Helpers all; + import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; @@ -60,7 +66,12 @@ } type record HLR_ConnHdlrPars { - HlrSubscriber sub + HlrSubscriber sub, + HLR_ConnHdlrParsUssd ussd optional +} + +type record HLR_ConnHdlrParsUssd { + OCT4 sid } template (value) HLR_ConnHdlrPars t_Pars(hexstring imsi, hexstring msisdn := ''H) := { @@ -69,11 +80,13 @@ msisdn := msisdn, aud2g := omit, aud3g := omit - } + }, + ussd := omit } template (value) HLR_ConnHdlrPars t_Pars_sub(HlrSubscriber sub) := { - sub := sub + sub := sub, + ussd := omit } type function void_fn() runs on HLR_ConnHdlr; @@ -450,6 +463,91 @@ return ret; } +function f_SS_xceive(hexstring imsi, OCT4 sid, GSUP_SessionState state, octetstring ss, + template (omit) integer exp_err_cause := omit) +runs on HLR_ConnHdlr return GSUP_PDU { + var GSUP_PDU ret; + timer T := 3.0; + var boolean exp_fail := false; + if (not istemplatekind(exp_err_cause, "omit")) { + exp_fail := true; + } + + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(imsi, sid, state, ss))); + T.start; + alt { + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, exp_err_cause)) -> value ret { + setverdict(pass); + } + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS ERROR Cause"); + } + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS.res for unknown IMSI"); + } + [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS ERROR"); + } + [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { + setverdict(pass); + } + [] GSUP.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for PROC_SS response"); + self.stop; + } + } + return ret; +} + +private function f_SS_expect(hexstring imsi, OCT4 sid, GSUP_SessionState state, + template SS_FacilityInformation facility := *) +runs on HLR_ConnHdlr return GSUP_PDU { + var GSUP_PDU ret; + timer T := 3.0; + var boolean exp_ss := true; + if (istemplatekind(facility, "omit")) { + exp_ss := false; + } + T.start; + alt { + [] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS ERROR Cause"); + } + [not exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, omit)) -> value ret { + setverdict(pass); + } + [exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, omit)) -> value ret { + setverdict(fail, "Unexpected PROC_SS.res without SS IE"); + } +/* + [exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, decmatch facility)) -> value ret { + setverdict(pass); + } +*/ + + [exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, ?)) -> value ret { + var GSUP_IeValue ss_ie; + f_gsup_find_ie(ret, OSMO_GSUP_SS_INFO_IE, ss_ie); + var SS_FacilityInformation dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); + log("pattern: ", facility); + if (match(dec_fac, facility)) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected PROC_SS.res with non-matching facility IE"); + } + } + [] GSUP.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for PROC_SS response"); + self.stop; + } + } + + return ret; +} + + /*********************************************************************** * Testcases @@ -675,6 +773,235 @@ setverdict(pass); } +import from HLR_EUSE all; + +/* Test for USSD request to undefined/unrouted short-code. Expect ss-NotAvailable(18) */ +private function f_TC_mo_ussd_unknown() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*#200#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_FACILITY_RETURN_ERROR(1, 18)); +} +testcase TC_mo_ussd_unknown() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_unknown), pars); + vc_conn.done; + } +} + +/* Test for USSD request to currently disconnected EUSE. Expect ss-SystemFailure(34) */ +private function f_TC_mo_ussd_euse_disc() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_FACILITY_RETURN_ERROR(1, 34)); +} +testcase TC_mo_ussd_euse_disc() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_euse_disc), pars); + vc_conn.done; + } +} + +/* Test for USSD request to internal own-imsi IUSE. */ +private function f_TC_mo_ussd_iuse_imsi() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var charstring resp_str; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*#101#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + resp_str := "Your IMSI is " & hex2str(g_pars.sub.imsi); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit(resp_str))); +} +testcase TC_mo_ussd_iuse_imsi() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_iuse_imsi), pars); + vc_conn.done; + } +} + +/* Test for USSD request to internal own-msisdn IUSE. */ +private function f_TC_mo_ussd_iuse_msisdn() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var charstring resp_str; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*#100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + resp_str := "Your extension is " & hex2str(g_pars.sub.msisdn); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit(resp_str))); +} +testcase TC_mo_ussd_iuse_msisdn() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_iuse_msisdn), pars); + vc_conn.done; + } +} + +/* Test routing of USSD to EUSE by a specific route */ +private function f_TC_mo_ussd_100() runs on HLR_ConnHdlr { + var GSUP_PDU res; + /* invoke / invoke id 1 / processUSS-req */ + //var octetstring ss := 'a11202010102013b300a04010f0405aa180c3602'O; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*100#"))); +} +testcase TC_mo_ussd_euse() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + var HLR_EUSE_CT vc_EUSE := HLR_EUSE_CT.create("EUSE-" & testcasename()); + vc_EUSE.start(HLR_EUSE.f_main_mo(mp_hlr_ip, mp_hlr_gsup_port, "foobar", refers(f_ss_echo))); + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_100), pars); + vc_conn.done; + } + + vc_EUSE.stop; +} + +/* Test routing of USSD to EUSE by a specific route, with CONTINUE */ +private function f_TC_mo_ussd_100_continue() runs on HLR_ConnHdlr { + var GSUP_PDU res; + /* Simulate BEGIN from MS/MSC */ + var octetstring ss := f_USSD_FACILITY_IE_INVOKE(op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + /* expect echo response from EUSE */ + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_CONTINUE, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*100#"))); + + /* Simulate CONTINUE from MS/MSC */ + ss := f_USSD_FACILITY_IE_INVOKE(op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "mahlzeit"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_CONTINUE, ss))); + + /* expect echo response from EUSE */ + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, + f_encGSM7bit("mahlzeit"))); +} +testcase TC_mo_ussd_euse_continue() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + var HLR_EUSE_CT vc_EUSE := HLR_EUSE_CT.create("EUSE-" & testcasename()); + vc_EUSE.start(HLR_EUSE.f_main_mo(mp_hlr_ip, mp_hlr_gsup_port, "foobar", + refers(f_ss_echo_continue))); + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_100_continue), pars); + vc_conn.done; + } + + vc_EUSE.stop; +} + + +/* Test routing of USSD to EUSE by default-route */ +private function f_TC_mo_ussd_999() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*999#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*999#"))); +} +testcase TC_mo_ussd_euse_defaultroute() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + var HLR_EUSE_CT vc_EUSE := HLR_EUSE_CT.create("EUSE-" & testcasename()); + vc_EUSE.start(HLR_EUSE.f_main_mo(mp_hlr_ip, mp_hlr_gsup_port, "foobar", refers(f_ss_echo))); + + f_init(false); + f_vty_config(VTY, "hlr", "ussd default-route external foobar"); + + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_999), pars); + vc_conn.done; + } + + f_vty_config(VTY, "hlr", "no ussd default-route"); + vc_EUSE.stop; +} + + +/* TODO USSD: + * MO USSD for IMSI of non-existant subscriber + * MT USSD from EUSE + * timeout cases + */ + /* TODO: * UL with ISD error * UL with ISD timeout @@ -700,6 +1027,14 @@ execute( TC_gsup_purge_cs() ); execute( TC_gsup_purge_ps() ); execute( TC_gsup_purge_unknown() ); + + execute( TC_mo_ussd_unknown() ); + execute( TC_mo_ussd_euse_disc() ); + execute( TC_mo_ussd_iuse_imsi() ); + execute( TC_mo_ussd_iuse_msisdn() ); + execute( TC_mo_ussd_euse() ); + execute( TC_mo_ussd_euse_continue() ); + execute( TC_mo_ussd_euse_defaultroute() ); }; }; diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 6044565..ba8180f 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -687,4 +687,15 @@ } ); +function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { + for (var integer i := 0; i < sizeof(msg.ies); i := i+1) { + if (msg.ies[i].tag == iei) { + ret := msg.ies[i].val; + return true; + } + } + return false; +} + + } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/10405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I74a3419140179b1625e82d1298864e424fb81398 Gerrit-Change-Number: 10405 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:04:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:04:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: move USSD_Helpers.ttcn to library In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10401 ) Change subject: move USSD_Helpers.ttcn to library ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22be6c03d85dc6d6a8266b5ebce5d0c69c0551ed Gerrit-Change-Number: 10401 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Aug 2018 09:04:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:04:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:04:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Link required libraries for USSD / SS messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10402 ) Change subject: hlr: Link required libraries for USSD / SS messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4501a4843b412dc06051c5e037764e581de1977a Gerrit-Change-Number: 10402 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Aug 2018 09:04:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:04:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:04:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: move USSD_Helpers.ttcn to library In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10401 ) Change subject: move USSD_Helpers.ttcn to library ...................................................................... move USSD_Helpers.ttcn to library We want to use those also from the HLR_Tests, not just from MSC_Tests. Change-Id: I22be6c03d85dc6d6a8266b5ebce5d0c69c0551ed --- R library/USSD_Helpers.ttcn M msc/gen_links.sh 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/USSD_Helpers.ttcn b/library/USSD_Helpers.ttcn similarity index 100% rename from msc/USSD_Helpers.ttcn rename to library/USSD_Helpers.ttcn diff --git a/msc/gen_links.sh b/msc/gen_links.sh index d8a7d22..a191aa5 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -90,7 +90,7 @@ FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " -FILES+="SS_Templates.ttcn SCCP_Templates.ttcn" +FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/10401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I22be6c03d85dc6d6a8266b5ebce5d0c69c0551ed Gerrit-Change-Number: 10401 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:04:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:04:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Link required libraries for USSD / SS messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10402 ) Change subject: hlr: Link required libraries for USSD / SS messages ...................................................................... hlr: Link required libraries for USSD / SS messages Change-Id: I4501a4843b412dc06051c5e037764e581de1977a --- M hlr/gen_links.sh M hlr/regen_makefile.sh 2 files changed, 19 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index 1e98cb2..f9e80c5 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -5,8 +5,8 @@ . ../gen_links.sh.inc DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src -FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc -TCCInterface.cc TCCInterface_ip.h" +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src @@ -21,10 +21,26 @@ FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.ROSE/src +FILES="Remote_Operations_Generic_ROS_PDUs.asn Remote_Operations_Information_Objects.asn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MAP/src +FILES="MAP_ApplicationContexts.asn MAP_CH_DataTypes.asn MAP_CallHandlingOperations.asn MAP_CommonDataTypes.asn MAP_DialogueInformation.asn MAP_ER_DataTypes.asn MAP_EncDec.cc MAP_Errors.asn MAP_GR_DataTypes.asn MAP_Group_Call_Operations.asn MAP_LCS_DataTypes.asn MAP_LocationServiceOperations.asn MAP_MS_DataTypes.asn MAP_MobileServiceOperations.asn MAP_OM_DataTypes.asn MAP_OperationAndMaintenanceOperations.asn MAP_PDU_Defs.asn MAP_Protocol.asn MAP_SM_DataTypes.asn MAP_SS_Code.asn MAP_SS_DataTypes.asn MAP_ShortMessageServiceOperations.asn MAP_SupplementaryServiceOperations.asn MAP_TS_Code.asn MAP_Types.ttcn " +FILES+="MAP_BS_Code.asn MAP_ExtensionDataTypes.asn MobileDomainDefinitions.asn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src +FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn " +FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" +gen_links $DIR $FILES + DIR=../library FILES="General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp GSUP_Types.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " +FILES+="SS_Templates.ttcn USSD_Helpers.ttcn " + gen_links $DIR $FILES diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 56f6671..1a1d812 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -2,7 +2,7 @@ MAIN="HLR_Tests.ttcn" -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc" +FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc TCCEncoding.cc SS_EncDec.cc MAP_EncDec.cc *.asn" export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL" -- To view, visit https://gerrit.osmocom.org/10402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4501a4843b412dc06051c5e037764e581de1977a Gerrit-Change-Number: 10402 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:06:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:06:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10403 to look at the new patch set (#2). Change subject: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity ...................................................................... HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity As OsmoHLR is getting support for external USSD Entities (EUSEs), we have to implement this function in the test logic in order to test it. Change-Id: Ibab210b06abfd5a21e81c7f7fbe574c4f67414a0 --- A hlr/HLR_EUSE.ttcn M library/GSUP_Types.ttcn 2 files changed, 135 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/10403/2 -- To view, visit https://gerrit.osmocom.org/10403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibab210b06abfd5a21e81c7f7fbe574c4f67414a0 Gerrit-Change-Number: 10403 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:07:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:07:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10403 ) Change subject: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibab210b06abfd5a21e81c7f7fbe574c4f67414a0 Gerrit-Change-Number: 10403 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Aug 2018 09:07:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:07:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:07:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: actually register simulated MSC as "MSC" identity to HLR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10404 ) Change subject: hlr: actually register simulated MSC as "MSC" identity to HLR ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b6dc719318db8aef960f3249c16c20deb5793a7 Gerrit-Change-Number: 10404 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Aug 2018 09:07:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:07:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:07:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Actual USSD test cases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10405 ) Change subject: HLR: Actual USSD test cases ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I74a3419140179b1625e82d1298864e424fb81398 Gerrit-Change-Number: 10405 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Aug 2018 09:07:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:07:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:07:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10403 ) Change subject: HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity ...................................................................... HLR: Add HLR_EUSE.ttcn to implement minimal external USSD Entity As OsmoHLR is getting support for external USSD Entities (EUSEs), we have to implement this function in the test logic in order to test it. Change-Id: Ibab210b06abfd5a21e81c7f7fbe574c4f67414a0 --- A hlr/HLR_EUSE.ttcn M library/GSUP_Types.ttcn 2 files changed, 135 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/hlr/HLR_EUSE.ttcn b/hlr/HLR_EUSE.ttcn new file mode 100644 index 0000000..1e7574b --- /dev/null +++ b/hlr/HLR_EUSE.ttcn @@ -0,0 +1,124 @@ +/* Simple / General implementation of an External USSD Entity using OsmoHLR's GSUP Protocol + * + * The idea is that a test case can simply start an instance of this component in parallel to its + * normal test components. HLR_EUSE_CT will then connect via GSUP to the HLR as the specified EUSE + * name. Any USSD related GSUP message received will be passed to a user-provided call-back + * function, which will return whatever PDU to send in response back to the HLR. + */ + +/* (C) 2018 by Harald Welte */ + +module HLR_EUSE { + +import from GSUP_Types all; +import from IPA_Emulation all; + +import from General_Types all; +import from Osmocom_Types all; +import from SS_Types all; +import from SS_Templates all; + +/* emulating an external USSD Entity towards OsmoHLR */ +type component HLR_EUSE_CT { + /* Component reference + config of underlying IPA emulation */ + var IPA_Emulation_CT vc_IPA_EUSE; + var IPA_CCM_Parameters ccm_pars; + /* port towards the underlying IPA emulation */ + port IPA_GSUP_PT EUSE; +} + +private function f_init(charstring hlr_ip, uint16_t hlr_gsup_port, charstring name) runs on HLR_EUSE_CT { + var charstring id := "EUSE-" & name; + ccm_pars := c_IPA_default_ccm_pars; + ccm_pars.name := "Osmocom TTCN-3 EUSE Simulator"; + ccm_pars.ser_nr := id; + + vc_IPA_EUSE := IPA_Emulation_CT.create("IPA-" & id); + map(vc_IPA_EUSE:IPA_PORT, system:IPA_CODEC_PT); + connect(vc_IPA_EUSE:IPA_GSUP_PORT, self:EUSE); + vc_IPA_EUSE.start(IPA_Emulation.main_client(hlr_ip, hlr_gsup_port, "", 0, ccm_pars)); + + timer T := 10.0; + T.start; + alt { + [] EUSE.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) { repeat; } + [] EUSE.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { } + [] T.timeout { + setverdict(fail, "EUSE: Timeout waiting for GSUP IPA Link to come up"); + self.stop; + } + } +} + +type function f_euse_cb(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU; + +function f_ss_echo_continue(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { + var GSUP_SessionState ss_next_state; + var GSUP_IeValue ss_ie; + var SS_FacilityInformation dec_fac, rsp_fac; + var octetstring ss_rsp; + + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); + dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); + log("dec_fac: ", dec_fac); + rsp_fac := valueof(ts_SS_USSD_FACILITY_RETURN_RESULT(dec_fac[0].invoke.invokeId.present_, + SS_OP_CODE_PROCESS_USS_REQ, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_DataCodingScheme, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_String)); + ss_rsp := enc_SS_FacilityInformation(rsp_fac); + select (ss_state) { + case (OSMO_GSUP_SESSION_STATE_BEGIN) { ss_next_state := OSMO_GSUP_SESSION_STATE_CONTINUE; } + case (OSMO_GSUP_SESSION_STATE_CONTINUE) { ss_next_state := OSMO_GSUP_SESSION_STATE_END; } + } + return valueof(ts_GSUP_PROC_SS_RES(rx_pdu.ies[0].val.imsi, rx_pdu.ies[1].val.session_id, + ss_next_state, ss_rsp)); +} + +function f_ss_echo(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { + var GSUP_IeValue ss_ie; + var SS_FacilityInformation dec_fac, rsp_fac; + var octetstring ss_rsp; + + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); + dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); + log("dec_fac: ", dec_fac); + rsp_fac := valueof(ts_SS_USSD_FACILITY_RETURN_RESULT(dec_fac[0].invoke.invokeId.present_, + SS_OP_CODE_PROCESS_USS_REQ, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_DataCodingScheme, + dec_fac[0].invoke.argument.uSSD_Arg.ussd_String)); + ss_rsp := enc_SS_FacilityInformation(rsp_fac); + return valueof(ts_GSUP_PROC_SS_RES(rx_pdu.ies[0].val.imsi, rx_pdu.ies[1].val.session_id, + OSMO_GSUP_SESSION_STATE_END, ss_rsp)); +} + +/* main function for handling mobile-originated USSD via GSUP */ +function f_main_mo(charstring hlr_ip, uint16_t hlr_gsup_port, charstring name, f_euse_cb cb_fn) +runs on HLR_EUSE_CT { + var GSUP_PDU rx_pdu, tx_pdu; + + f_init(hlr_ip, hlr_gsup_port, name); + + while (true) { + alt { + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_BEGIN)) -> value rx_pdu { + EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_BEGIN, rx_pdu)); + } + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_CONTINUE)) -> value rx_pdu { + EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_CONTINUE, rx_pdu)); + } + + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_END)) -> value rx_pdu { + EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_END, rx_pdu)); + } + + + [] EUSE.receive { + setverdict(fail, "EUSE: Unexpected Rx from HLR"); + self.stop; + } + } + } +} + + +} diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 6044565..ba8180f 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -687,4 +687,15 @@ } ); +function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { + for (var integer i := 0; i < sizeof(msg.ies); i := i+1) { + if (msg.ies[i].tag == iei) { + ret := msg.ies[i].val; + return true; + } + } + return false; +} + + } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/10403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibab210b06abfd5a21e81c7f7fbe574c4f67414a0 Gerrit-Change-Number: 10403 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:07:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:07:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: actually register simulated MSC as "MSC" identity to HLR In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10404 ) Change subject: hlr: actually register simulated MSC as "MSC" identity to HLR ...................................................................... hlr: actually register simulated MSC as "MSC" identity to HLR Change-Id: I3b6dc719318db8aef960f3249c16c20deb5793a7 --- M hlr/HLR_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 753f92e..2bf5e57 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -103,6 +103,7 @@ ccm_pars := c_IPA_default_ccm_pars; ccm_pars.name := "Osmocom TTCN-3 GSUP Simulator"; + ccm_pars.ser_nr := "MSC-00-00-00-00-00-00"; vc_IPA := IPA_Emulation_CT.create(id & "-IPA"); log("legacy= ", legacy); -- To view, visit https://gerrit.osmocom.org/10404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b6dc719318db8aef960f3249c16c20deb5793a7 Gerrit-Change-Number: 10404 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:07:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:07:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR: Actual USSD test cases In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10405 ) Change subject: HLR: Actual USSD test cases ...................................................................... HLR: Actual USSD test cases Change-Id: I74a3419140179b1625e82d1298864e424fb81398 --- M hlr/HLR_Tests.ttcn 1 file changed, 338 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 2bf5e57..29af522 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -8,6 +8,12 @@ import from Osmocom_Types all; import from Osmocom_CTRL_Adapter all; +import from TCCEncoding_Functions all; +import from SS_Types all; +import from SS_Templates all; +import from MAP_Errors all; +import from USSD_Helpers all; + import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; @@ -60,7 +66,12 @@ } type record HLR_ConnHdlrPars { - HlrSubscriber sub + HlrSubscriber sub, + HLR_ConnHdlrParsUssd ussd optional +} + +type record HLR_ConnHdlrParsUssd { + OCT4 sid } template (value) HLR_ConnHdlrPars t_Pars(hexstring imsi, hexstring msisdn := ''H) := { @@ -69,11 +80,13 @@ msisdn := msisdn, aud2g := omit, aud3g := omit - } + }, + ussd := omit } template (value) HLR_ConnHdlrPars t_Pars_sub(HlrSubscriber sub) := { - sub := sub + sub := sub, + ussd := omit } type function void_fn() runs on HLR_ConnHdlr; @@ -450,6 +463,91 @@ return ret; } +function f_SS_xceive(hexstring imsi, OCT4 sid, GSUP_SessionState state, octetstring ss, + template (omit) integer exp_err_cause := omit) +runs on HLR_ConnHdlr return GSUP_PDU { + var GSUP_PDU ret; + timer T := 3.0; + var boolean exp_fail := false; + if (not istemplatekind(exp_err_cause, "omit")) { + exp_fail := true; + } + + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(imsi, sid, state, ss))); + T.start; + alt { + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, exp_err_cause)) -> value ret { + setverdict(pass); + } + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS ERROR Cause"); + } + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS.res for unknown IMSI"); + } + [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS ERROR"); + } + [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { + setverdict(pass); + } + [] GSUP.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for PROC_SS response"); + self.stop; + } + } + return ret; +} + +private function f_SS_expect(hexstring imsi, OCT4 sid, GSUP_SessionState state, + template SS_FacilityInformation facility := *) +runs on HLR_ConnHdlr return GSUP_PDU { + var GSUP_PDU ret; + timer T := 3.0; + var boolean exp_ss := true; + if (istemplatekind(facility, "omit")) { + exp_ss := false; + } + T.start; + alt { + [] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + setverdict(fail, "Unexpected PROC_SS ERROR Cause"); + } + [not exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, omit)) -> value ret { + setverdict(pass); + } + [exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, omit)) -> value ret { + setverdict(fail, "Unexpected PROC_SS.res without SS IE"); + } +/* + [exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, decmatch facility)) -> value ret { + setverdict(pass); + } +*/ + + [exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, ?)) -> value ret { + var GSUP_IeValue ss_ie; + f_gsup_find_ie(ret, OSMO_GSUP_SS_INFO_IE, ss_ie); + var SS_FacilityInformation dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); + log("pattern: ", facility); + if (match(dec_fac, facility)) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected PROC_SS.res with non-matching facility IE"); + } + } + [] GSUP.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for PROC_SS response"); + self.stop; + } + } + + return ret; +} + + /*********************************************************************** * Testcases @@ -675,6 +773,235 @@ setverdict(pass); } +import from HLR_EUSE all; + +/* Test for USSD request to undefined/unrouted short-code. Expect ss-NotAvailable(18) */ +private function f_TC_mo_ussd_unknown() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*#200#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_FACILITY_RETURN_ERROR(1, 18)); +} +testcase TC_mo_ussd_unknown() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_unknown), pars); + vc_conn.done; + } +} + +/* Test for USSD request to currently disconnected EUSE. Expect ss-SystemFailure(34) */ +private function f_TC_mo_ussd_euse_disc() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_FACILITY_RETURN_ERROR(1, 34)); +} +testcase TC_mo_ussd_euse_disc() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_euse_disc), pars); + vc_conn.done; + } +} + +/* Test for USSD request to internal own-imsi IUSE. */ +private function f_TC_mo_ussd_iuse_imsi() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var charstring resp_str; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*#101#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + resp_str := "Your IMSI is " & hex2str(g_pars.sub.imsi); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit(resp_str))); +} +testcase TC_mo_ussd_iuse_imsi() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_iuse_imsi), pars); + vc_conn.done; + } +} + +/* Test for USSD request to internal own-msisdn IUSE. */ +private function f_TC_mo_ussd_iuse_msisdn() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var charstring resp_str; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*#100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + resp_str := "Your extension is " & hex2str(g_pars.sub.msisdn); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit(resp_str))); +} +testcase TC_mo_ussd_iuse_msisdn() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_iuse_msisdn), pars); + vc_conn.done; + } +} + +/* Test routing of USSD to EUSE by a specific route */ +private function f_TC_mo_ussd_100() runs on HLR_ConnHdlr { + var GSUP_PDU res; + /* invoke / invoke id 1 / processUSS-req */ + //var octetstring ss := 'a11202010102013b300a04010f0405aa180c3602'O; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*100#"))); +} +testcase TC_mo_ussd_euse() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + var HLR_EUSE_CT vc_EUSE := HLR_EUSE_CT.create("EUSE-" & testcasename()); + vc_EUSE.start(HLR_EUSE.f_main_mo(mp_hlr_ip, mp_hlr_gsup_port, "foobar", refers(f_ss_echo))); + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_100), pars); + vc_conn.done; + } + + vc_EUSE.stop; +} + +/* Test routing of USSD to EUSE by a specific route, with CONTINUE */ +private function f_TC_mo_ussd_100_continue() runs on HLR_ConnHdlr { + var GSUP_PDU res; + /* Simulate BEGIN from MS/MSC */ + var octetstring ss := f_USSD_FACILITY_IE_INVOKE(op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*100#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + /* expect echo response from EUSE */ + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_CONTINUE, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*100#"))); + + /* Simulate CONTINUE from MS/MSC */ + ss := f_USSD_FACILITY_IE_INVOKE(op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "mahlzeit"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_CONTINUE, ss))); + + /* expect echo response from EUSE */ + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, + f_encGSM7bit("mahlzeit"))); +} +testcase TC_mo_ussd_euse_continue() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + var HLR_EUSE_CT vc_EUSE := HLR_EUSE_CT.create("EUSE-" & testcasename()); + vc_EUSE.start(HLR_EUSE.f_main_mo(mp_hlr_ip, mp_hlr_gsup_port, "foobar", + refers(f_ss_echo_continue))); + + f_init(false); + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_100_continue), pars); + vc_conn.done; + } + + vc_EUSE.stop; +} + + +/* Test routing of USSD to EUSE by default-route */ +private function f_TC_mo_ussd_999() runs on HLR_ConnHdlr { + var GSUP_PDU res; + var octetstring ss := f_USSD_FACILITY_IE_INVOKE( + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "*999#"); + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, ss))); + f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*999#"))); +} +testcase TC_mo_ussd_euse_defaultroute() runs on test_CT { + var HlrSubscriberList sl; + var HLR_ConnHdlr vc_conn; + + var HLR_EUSE_CT vc_EUSE := HLR_EUSE_CT.create("EUSE-" & testcasename()); + vc_EUSE.start(HLR_EUSE.f_main_mo(mp_hlr_ip, mp_hlr_gsup_port, "foobar", refers(f_ss_echo))); + + f_init(false); + f_vty_config(VTY, "hlr", "ussd default-route external foobar"); + + sl := f_gen_subs(); + for (var integer i := 0; i < sizeof(sl); i := i+1) { + var HLR_ConnHdlrPars pars := valueof(t_Pars_sub(sl[i])); + pars.ussd.sid := f_rnd_octstring(4); + f_vty_subscr_create(VTY, pars.sub); + vc_conn := f_start_handler(refers(f_TC_mo_ussd_999), pars); + vc_conn.done; + } + + f_vty_config(VTY, "hlr", "no ussd default-route"); + vc_EUSE.stop; +} + + +/* TODO USSD: + * MO USSD for IMSI of non-existant subscriber + * MT USSD from EUSE + * timeout cases + */ + /* TODO: * UL with ISD error * UL with ISD timeout @@ -700,6 +1027,14 @@ execute( TC_gsup_purge_cs() ); execute( TC_gsup_purge_ps() ); execute( TC_gsup_purge_unknown() ); + + execute( TC_mo_ussd_unknown() ); + execute( TC_mo_ussd_euse_disc() ); + execute( TC_mo_ussd_iuse_imsi() ); + execute( TC_mo_ussd_iuse_msisdn() ); + execute( TC_mo_ussd_euse() ); + execute( TC_mo_ussd_euse_continue() ); + execute( TC_mo_ussd_euse_defaultroute() ); }; }; -- To view, visit https://gerrit.osmocom.org/10405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I74a3419140179b1625e82d1298864e424fb81398 Gerrit-Change-Number: 10405 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:29:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:29:27 +0000 Subject: Change in docker-playground[master]: hlr: Update config file with USSD related bits Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10406 Change subject: hlr: Update config file with USSD related bits ...................................................................... hlr: Update config file with USSD related bits HLR_Tests.ttcn now wants to test USSD, we have to add the matching config. Change-Id: I45047b505411a5f53a7ce5e2d203c526e27a9732 --- M ttcn3-hlr-test/osmo-hlr.cfg 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/06/10406/1 diff --git a/ttcn3-hlr-test/osmo-hlr.cfg b/ttcn3-hlr-test/osmo-hlr.cfg index 71a76c8..9192b58 100644 --- a/ttcn3-hlr-test/osmo-hlr.cfg +++ b/ttcn3-hlr-test/osmo-hlr.cfg @@ -17,3 +17,7 @@ hlr gsup bind ip 0.0.0.0 + euse foobar + ussd route prefix *#100 internal own-msisdn + ussd route prefix *#101 internal own-imsi + ussd route prefix *100 external foobar -- To view, visit https://gerrit.osmocom.org/10406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I45047b505411a5f53a7ce5e2d203c526e27a9732 Gerrit-Change-Number: 10406 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:29:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:29:54 +0000 Subject: Change in docker-playground[master]: hlr: Update config file with USSD related bits In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10406 ) Change subject: hlr: Update config file with USSD related bits ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45047b505411a5f53a7ce5e2d203c526e27a9732 Gerrit-Change-Number: 10406 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 09:29:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:29:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 8 Aug 2018 09:29:55 +0000 Subject: Change in docker-playground[master]: hlr: Update config file with USSD related bits In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10406 ) Change subject: hlr: Update config file with USSD related bits ...................................................................... hlr: Update config file with USSD related bits HLR_Tests.ttcn now wants to test USSD, we have to add the matching config. Change-Id: I45047b505411a5f53a7ce5e2d203c526e27a9732 --- M ttcn3-hlr-test/osmo-hlr.cfg 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-hlr-test/osmo-hlr.cfg b/ttcn3-hlr-test/osmo-hlr.cfg index 71a76c8..9192b58 100644 --- a/ttcn3-hlr-test/osmo-hlr.cfg +++ b/ttcn3-hlr-test/osmo-hlr.cfg @@ -17,3 +17,7 @@ hlr gsup bind ip 0.0.0.0 + euse foobar + ussd route prefix *#100 internal own-msisdn + ussd route prefix *#101 internal own-imsi + ussd route prefix *100 external foobar -- To view, visit https://gerrit.osmocom.org/10406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I45047b505411a5f53a7ce5e2d203c526e27a9732 Gerrit-Change-Number: 10406 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:57:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 8 Aug 2018 09:57:17 +0000 Subject: Change in osmo-ci[master]: osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10398 ) Change subject: osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia4199aa5cfd1f39d34ed7c6104881c68d00dcffa Gerrit-Change-Number: 10398 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 08 Aug 2018 09:57:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 09:57:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 8 Aug 2018 09:57:44 +0000 Subject: Change in osmo-ci[master]: osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10398 ) Change subject: osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter ...................................................................... osmo-gsm-tester: Add OSMO_GSM_TESTER_BUILD_osmo_hlr parameter For some reason almost all projects allow to permit building a specific non-master branch, only osmo-hlr was missing that parameter. Untested. Change-Id: Ia4199aa5cfd1f39d34ed7c6104881c68d00dcffa --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index ac1e868..748062d 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -83,6 +83,8 @@ - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_msc - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_osmo_hlr + - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_pcu - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_trx -- To view, visit https://gerrit.osmocom.org/10398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia4199aa5cfd1f39d34ed7c6104881c68d00dcffa Gerrit-Change-Number: 10398 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 13:45:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 8 Aug 2018 13:45:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10372 ) Change subject: add DTX fill frame BTS tests ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10372/2/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/10372/2/bts/BTS_Tests.ttcn at 3855 PS2, Line 3855: 2.5 > how do you get to this 2.5 seconds? IMHO, 104*4.6ms = 478ms. [?] I did initially try a 500msec timer but then the test failed. Maybe the timing of the simulation isn't accurate enough, at least on my machine? Maybe frames do get lost? I don't know. After some trial and error I arrived at 2.5 seconds as an interval that seemed to provide stable test results. But I didn't try very hard to the interval as small as possible. I think you're right that counting frame numbers will be better. I'll try to implement the test that way in the next patch set. https://gerrit.osmocom.org/#/c/10372/2/bts/BTS_Tests.ttcn at 3866 PS2, Line 3866: t_RslChanNr_Bm(1) > I would structure the test in a way that it iterates over all the TCH/F we have. [?] Sure. I'll look at what other tests are doing and try to implement your suggestion. -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 13:45:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 15:22:19 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 8 Aug 2018 15:22:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Wait for immedate assignment in f_chreq_act_ack Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10407 Change subject: bsc: Wait for immedate assignment in f_chreq_act_ack ...................................................................... bsc: Wait for immedate assignment in f_chreq_act_ack Sometimes TC_chan_rel_hard_rlsd_ms_dead could fail because the Immediate assignment command would arrive in the RSL queue after it was cleared in f_expect_chan_rel. The alt statement would now never complete since the Immediate Assignment was blocking/hogging the queue. Wait explicitly for the IMM ASS in f_chreq_act_ack before continuing. Change-Id: I2831d4caf7f045b3396d28a978328e8a1097d8d3 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/10407/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 5af4573..e94b781 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -642,6 +642,7 @@ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); var RslChannelNr chan_nr := rx_rsl.ies[0].body.chan_nr; f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); + rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); return chan_nr; } -- To view, visit https://gerrit.osmocom.org/10407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2831d4caf7f045b3396d28a978328e8a1097d8d3 Gerrit-Change-Number: 10407 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 17:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 8 Aug 2018 17:12:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10372 ) Change subject: add DTX fill frame BTS tests ...................................................................... Patch Set 2: I am trying to implement the "fn + 104 frames" approach. I am a bit confused about how GSM frame numbers work. Is my test supposed to receive consecutive numbers? Apparently I don't receive a DATA_IND in every GSM frame. If that is expected, I will need to count the number of DATA_IND frames received until I have received 104 of them. Simply checking for fn >= first_fn + 104 won't do. Below is an example of the numbers I get during one test run with the following alt match statement: [] L1CTL.receive(tr_L1CTL_DATA_IND(?, ?)) -> value dl 18:54:06.671153 6 BTS_Tests.ttcn:3832 received frame number 221 18:54:06.683170 6 BTS_Tests.ttcn:3832 received frame number 225 18:54:06.701714 6 BTS_Tests.ttcn:3832 received frame number 229 18:54:06.724681 6 BTS_Tests.ttcn:3832 received frame number 234 18:54:06.743386 6 BTS_Tests.ttcn:3832 received frame number 238 18:54:06.761940 6 BTS_Tests.ttcn:3832 received frame number 242 18:54:06.784724 6 BTS_Tests.ttcn:3832 received frame number 247 18:54:06.802282 6 BTS_Tests.ttcn:3832 received frame number 251 18:54:06.821903 6 BTS_Tests.ttcn:3832 received frame number 255 18:54:06.844862 6 BTS_Tests.ttcn:3832 received frame number 260 18:54:06.863591 6 BTS_Tests.ttcn:3832 received frame number 264 18:54:06.881764 6 BTS_Tests.ttcn:3832 received frame number 268 18:54:06.904870 6 BTS_Tests.ttcn:3832 received frame number 273 18:54:06.923782 6 BTS_Tests.ttcn:3832 received frame number 277 18:54:06.941580 6 BTS_Tests.ttcn:3832 received frame number 281 18:54:06.964854 6 BTS_Tests.ttcn:3832 received frame number 286 18:54:06.983030 6 BTS_Tests.ttcn:3832 received frame number 290 18:54:07.002156 6 BTS_Tests.ttcn:3832 received frame number 294 18:54:07.024745 6 BTS_Tests.ttcn:3832 received frame number 299 18:54:07.043112 6 BTS_Tests.ttcn:3832 received frame number 303 18:54:07.062144 6 BTS_Tests.ttcn:3832 received frame number 307 18:54:07.066103 6 BTS_Tests.ttcn:3832 received frame number 233 18:54:07.085294 6 BTS_Tests.ttcn:3832 received frame number 312 18:54:07.103807 6 BTS_Tests.ttcn:3832 received frame number 316 18:54:07.121760 6 BTS_Tests.ttcn:3832 received frame number 320 18:54:07.139734 6 BTS_Tests.ttcn:3832 received frame number 325 -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 08 Aug 2018 17:12:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From laforge at gnumonks.org Wed Aug 8 19:48:51 2018 From: laforge at gnumonks.org (Harald Welte) Date: Wed, 8 Aug 2018 21:48:51 +0200 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: <20180808194851.GI21009@nataraja> On Wed, Aug 08, 2018 at 05:12:56PM +0000, Stefan Sperling wrote: > I am a bit confused about how GSM frame numbers work. > Is my test supposed to receive consecutive numbers? probably not, as not all logical channels are active? Also, every frame consists of 8 TS which each transports one burst. Only four consecutive burst on a given logical channel will render one block. > Apparently I don't receive a DATA_IND in every GSM frame. > If that is expected, I will need to count the number of DATA_IND frames received until I have received 104 of them. Simply checking for fn >= first_fn + 104 won't do. you will not receive 104 data indications. Every frame (if a given logical channel is active in that frame) will only transmit 1/4th of a block (l2 message). During 104 frames, on a TCH/F, you should expect: * 24 TCH/F or FACCH DATA_IND * 1 SACCH DATA_IND -- - Harald Welte http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6) From gerrit-no-reply at lists.osmocom.org Wed Aug 8 20:54:38 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 8 Aug 2018 20:54:38 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10185/3/src/gsm/gsm48_arfcn_range_encode.c File src/gsm/gsm48_arfcn_range_encode.c: https://gerrit.osmocom.org/#/c/10185/3/src/gsm/gsm48_arfcn_range_encode.c at 10 PS3, Line 10: * it under the terms of the GNU Affero General Public License as published by > GNU GPLv2-or-later. [?] I don't object a relicensing to GPLv2 or later. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Wed, 08 Aug 2018 20:54:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 8 21:05:14 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 8 Aug 2018 21:05:14 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10185/3/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/10185/3/tests/gsm0408/gsm0408_test.c at 2 PS3, Line 2: * (C) 2012 by Harald Welte You might need to update this as well. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Wed, 08 Aug 2018 21:05:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 8 23:58:19 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 8 Aug 2018 23:58:19 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sip-connector_=C2=BB_a1=3D?= =?UTF-8?Q?default,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#600?= Message-ID: <1815022147.123.1533772699383.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 11.42 KB...] checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.12.0.24-d14ec > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer_gettimeofday.lo CC select.lo CC timer.lo CC timer_clockgettime.lo CC msgb.lo CC bitvec.lo CC signal.lo CC bits.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC rate_ctr.lo CC logging_gsmtap.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC stat_item.lo CC macaddr.lo CC stats_statsd.lo CC stats.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC serial.lo CC msgfile.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC utils.lo CC vector.lo CC vty.lo CC logging_vty.lo CC stats_vty.lo CC telnet_interface.lo CC fsm_vty.lo CC talloc_ctx_vty.lo /bin/bash: line 2: 28426 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT talloc_ctx_vty.lo -MD -MP -MF $depbase.Tpo -c -o talloc_ctx_vty.lo talloc_ctx_vty.c Makefile:476: recipe for target 'talloc_ctx_vty.lo' failed make[2]: *** [talloc_ctx_vty.lo] Error 132 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:604: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Aug 9 00:11:33 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 00:11:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: asgsn: use vty cmd `reset sgsn state`. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10388 to look at the new patch set (#2). Change subject: asgsn: use vty cmd `reset sgsn state`. ...................................................................... asgsn: use vty cmd `reset sgsn state`. Cleans most of the sgsn state. Depends on the SGSN commit I92096f3f6ea49e75676e30e9921d00210bac5382. Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/10388/2 -- To view, visit https://gerrit.osmocom.org/10388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 Gerrit-Change-Number: 10388 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 00:17:24 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 00:17:24 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10370 to look at the new patch set (#2). Change subject: vty: add cmd "reset sgsn state" ...................................................................... vty: add cmd "reset sgsn state" Reset the SGSN internal state. Useful when testing the SGSN via TTCN3. Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 --- M src/gprs/sgsn_vty.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/70/10370/2 -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 00:22:18 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 00:22:18 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10371 to look at the new patch set (#4). Change subject: bssgp: introduce flush queue functions ...................................................................... bssgp: introduce flush queue functions To reset the state of BSSGP allow to flush the BSSGP queues. When testing (with TTCN3) the test object should be resetted between each test. Introduce the functions: bssgp_fc_flush_queue() - flushs a single flow control object bssgp_flush_all_queues() - flushs queues of all BSSGP connections Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/libosmogb.map 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/10371/4 -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 00:24:28 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 00:24:28 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10370 to look at the new patch set (#3). Change subject: vty: add cmd "reset sgsn state" ...................................................................... vty: add cmd "reset sgsn state" Reset the SGSN internal state. Useful when testing the SGSN via TTCN3. Depends on the libosmocore commit I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 --- M src/gprs/sgsn_vty.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/70/10370/3 -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 00:26:12 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 00:26:12 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10371 to look at the new patch set (#5). Change subject: bssgp: introduce flush queue functions ...................................................................... bssgp: introduce flush queue functions To reset the state of BSSGP allow to flush the BSSGP queues. When testing (with TTCN3) the test object should be resetted between each test. Introduce the functions: bssgp_fc_flush_queue() - flushs a single flow control object bssgp_flush_all_queues() - flushs queues of all BSSGP connections Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/libosmogb.map 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/10371/5 -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 01:26:53 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 01:26:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10376 to look at the new patch set (#2). Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has configuration values hardcoded or bound to module parameters which prevents multiple instances. Replace the module parameter based configuration with configuration given when starting the NS_Emaulation. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 62 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10376/2 -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 01:27:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 01:27:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fill g_gb configs for the remaining Gb interfaces In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/10375 ) Change subject: sgsn: fill g_gb configs for the remaining Gb interfaces ...................................................................... sgsn: fill g_gb configs for the remaining Gb interfaces When testing with multiple Routing Areas, multiple Gb interface are required. Change-Id: I7f56618110f04d99b1b43e69d89167e384b61a34 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index ce796e8..6c94d14 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -188,6 +188,32 @@ }, sgsn_role := false }; + g_gb[1].cfg := { + nsei := 97, + bvci := 210, + cell_id := { + ra_id := { + lai := { + mcc_mnc := mcc_mnc, lac := 13200}, + rac := 0 + }, + cell_id := 20961 + }, + sgsn_role := false + }; + g_gb[2].cfg := { + nsei := 98, + bvci := 220, + cell_id := { + ra_id := { + lai := { + mcc_mnc := mcc_mnc, lac := 13300}, + rac := 0 + }, + cell_id := 20962 + }, + sgsn_role := false + }; f_init_gb(g_gb[0], "SGSN_Test-Gb0"); f_init_gsup("SGSN_Test"); -- To view, visit https://gerrit.osmocom.org/10375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7f56618110f04d99b1b43e69d89167e384b61a34 Gerrit-Change-Number: 10375 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 01:29:22 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 01:29:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10376 to look at the new patch set (#3). Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has configuration values hardcoded or bound to module parameters which prevents multiple instances. Replace the module parameter based configuration with configuration given when starting the NS_Emaulation. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 62 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10376/3 -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 01:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 01:31:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10376 to look at the new patch set (#4). Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has configuration values hardcoded or bound to module parameters which prevents multiple instances. Replace the module parameter based configuration with configuration given when starting the NS_Emaulation. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 63 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10376/4 -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 01:33:06 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 01:33:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10376 to look at the new patch set (#5). Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has configuration values hardcoded or bound to module parameters which prevents multiple instances. Replace the module parameter based configuration with configuration given when starting the NS_Emaulation. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 63 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10376/5 -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 01:39:51 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 01:39:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10376 to look at the new patch set (#6). Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has configuration values hardcoded or bound to module parameters which prevents multiple instances. Replace the module parameter based configuration with configuration given when starting the NS_Emaulation. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 47 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10376/6 -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 02:00:29 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 02:00:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10376 to look at the new patch set (#7). Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has configuration values hardcoded or bound to module parameters which prevents multiple instances. Replace the module parameter based configuration with configuration given when starting the NS_Emaulation. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 47 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/10376/7 -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 02:01:54 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 02:01:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: create 3 instances of BSSGP at the same time In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10378 ) Change subject: sgsn: create 3 instances of BSSGP at the same time ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10378/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/10378/1/sgsn/SGSN_Tests.ttcn at 222 PS1, Line 222: f_init_gb(g_gb[1], "SGSN_Test-Gb0", 1); > shouldn't that be SGSN_Test-Gb1 and Gb2 in the name? right. -- To view, visit https://gerrit.osmocom.org/10378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf Gerrit-Change-Number: 10378 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 09 Aug 2018 02:01:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 02:02:57 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 02:02:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: use vty cmd `reset sgsn state`. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10388 to look at the new patch set (#3). Change subject: sgsn: use vty cmd `reset sgsn state`. ...................................................................... sgsn: use vty cmd `reset sgsn state`. Cleans most of the sgsn state. Depends on the SGSN commit I92096f3f6ea49e75676e30e9921d00210bac5382. Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/10388/3 -- To view, visit https://gerrit.osmocom.org/10388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 Gerrit-Change-Number: 10388 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 03:08:18 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 03:08:18 +0000 Subject: Change in osmo-trx[master]: debian: add patches for debian8 In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10276 ) Change subject: debian: add patches for debian8 ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I261302d2ed16e76540073589504e7426e23d00a1 Gerrit-Change-Number: 10276 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 03:08:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 03:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 9 Aug 2018 03:08:21 +0000 Subject: Change in osmo-ci[master]: obs-nightly: introduce osmo-trx-debian8-jessie In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10277 ) Change subject: obs-nightly: introduce osmo-trx-debian8-jessie ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8477b580976b376ee5abdde98a651d47199ef6d9 Gerrit-Change-Number: 10277 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Comment-Date: Thu, 09 Aug 2018 03:08:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Aug 9 03:09:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 9 Aug 2018 03:09:33 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-osmo-sip-connector_=C2=BB?= =?UTF-8?Q?_a1=3Ddefault,a2=3Ddefault,a3=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#601?= In-Reply-To: <1815022147.123.1533772699383.JavaMail.jenkins@jenkins.osmocom.org> References: <1815022147.123.1533772699383.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <552531886.125.1533784173103.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Aug 9 09:16:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 9 Aug 2018 09:16:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10372 to look at the new patch set (#3). Change subject: add DTX fill frame BTS tests ...................................................................... add DTX fill frame BTS tests Add tests TC_tch_sign_l2_fill_frame and TC_tch_sign_l2_fill_frame_dtxd. TC_tch_sign_l2_fill_frame is already passing and verifies that fill frames are sent if there is nothing else to transmit on a SDCCH4/SDCCH8, TCH/H, or TCH/F signalling channel where DTX is disabled for downlink. TC_tch_sign_l2_fill_frame_dtxd is currently failing. It verifies that only specific fill frames are sent, as required by GSM 05.08 for TCHF signalling channels with DTX enabled for downlink. At present, our implementation generates no fill frames in this case, which is one piece of the problem described in issue OS#1950. Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Related: OS#1950 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml M library/RSL_Types.ttcn 3 files changed, 196 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/10372/3 -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 09:48:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 9 Aug 2018 09:48:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: check local port only once Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10408 Change subject: mgcp_client: check local port only once ...................................................................... mgcp_client: check local port only once When the user has set a local port for the mgcp client we want the client to exit if this port is already occupied. If no port is set the IETF default port is configured automatically. When we find this port occupied we try up to 100 times the next port to find a useable port. Since the for loop that controls the attempts always sets the port config it uses for its checks it will mistakenly assume that the user has set a port on the second cycle. - Make sure we only check for the default port in the first cycle Change-Id: Ic1fd1018d68fcac94961321615bfdd726465532d --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/08/10408/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 3663163..c10abc9 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -801,7 +801,7 @@ * configured then we assume that the user has choosen * that port conciously and we will not try to resolve * this by silently choosing a different port. */ - if (mgcp->actual.local_port != MGCP_CLIENT_LOCAL_PORT_DEFAULT) + if (mgcp->actual.local_port != MGCP_CLIENT_LOCAL_PORT_DEFAULT && i == 0) return -EINVAL; /* Choose a new port number to try next */ -- To view, visit https://gerrit.osmocom.org/10408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1fd1018d68fcac94961321615bfdd726465532d Gerrit-Change-Number: 10408 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 10:02:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 9 Aug 2018 10:02:46 +0000 Subject: Change in mncc-python[master]: recommend stock Debian/Ubuntu package for fysom Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10409 Change subject: recommend stock Debian/Ubuntu package for fysom ...................................................................... recommend stock Debian/Ubuntu package for fysom fysom is now available as a regular Debian/Ubuntu package so there is no need anymore to install it via pip: https://packages.debian.org/stretch/python-fysom https://packages.ubuntu.com/bionic/python-fysom Change-Id: I59e3b93c1d3f849f14dcb2344f6f033312331884 --- M README 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/09/10409/1 diff --git a/README b/README index e1f68be..4645559 100644 --- a/README +++ b/README @@ -12,9 +12,7 @@ mncc-python needs python-pykka, and fysom. On Debian or Ubuntu you can install them via - sudo apt-get install python-pykka python-pip - sudo pip install fysom - + sudo apt-get install python-pykka python-fysom = Getting the code = -- To view, visit https://gerrit.osmocom.org/10409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I59e3b93c1d3f849f14dcb2344f6f033312331884 Gerrit-Change-Number: 10409 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 10:49:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 9 Aug 2018 10:49:46 +0000 Subject: Change in docker-playground[master]: Introduce Dockerfile for the GR-GSM project Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10410 Change subject: Introduce Dockerfile for the GR-GSM project ...................................................................... Introduce Dockerfile for the GR-GSM project This change introduces a new sub-project - 'gr-gsm-master'. It was decided to use Arch Linux as the base image, because it provides the recent version of both UHD and GNU Radio without tons of dependencies, such as Xorg. Note: as there in no libosmocore package in Arch Linux, it will be built from the latest source code. Change-Id: I115b59dc9eaec5d132f3f64c4ee321173459e9ed --- M Makefile A gr-gsm-master/.release A gr-gsm-master/Dockerfile A gr-gsm-master/Makefile 4 files changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/10/10410/1 diff --git a/Makefile b/Makefile index 2cdbc58..f82e3f5 100644 --- a/Makefile +++ b/Makefile @@ -68,3 +68,7 @@ .PHONY: m3ua-test m3ua-test: osmo-stp-master sigtran-tests $(MAKE) -C m3ua-test + +.PHONY: gr-gsm-master +gr-gsm-master: + $(MAKE) -C gr-gsm-master diff --git a/gr-gsm-master/.release b/gr-gsm-master/.release new file mode 100644 index 0000000..3e94f0e --- /dev/null +++ b/gr-gsm-master/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=gr-gsm-master-0.0.0 diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile new file mode 100644 index 0000000..e75d318 --- /dev/null +++ b/gr-gsm-master/Dockerfile @@ -0,0 +1,81 @@ +FROM base/archlinux + +MAINTAINER Vadim Yanitskiy + +ARG LIBOSMOCORE_BRANCH="master" +ARG GR_GSM_BRANCH="fixeria/trx" + +# Build dependencies +ENV BUILD_DEPS \ + automake \ + autoconf \ + libtool \ + pkgconf \ + cmake \ + make \ + swig \ + gcc + +# Sync pacman +RUN pacman -Syu + +# Install persistent packages +RUN pacman -S --needed --noconfirm \ + gnuradio \ + python2 \ + python2-scipy \ + python2-requests \ + talloc \ + boost + +# Download USRP firmware +RUN uhd_images_downloader + +# Install build dependencies +RUN pacman -S --needed --noconfirm \ + $BUILD_DEPS + +# Make Python2 default +RUN ln -s /usr/bin/python2 /usr/bin/python + +# Install and configure git +RUN pacman -S --needed --noconfirm git \ + && git config --global user.email docker at dock.er \ + && git config --global user.name "Dock Er" + +WORKDIR /tmp + +# Download, build and install libosmocore +RUN git clone git://git.osmocom.org/libosmocore +ADD http://git.osmocom.org/libosmocore/patch?h=$LIBOSMOCORE_BRANCH /tmp/commit-libosmocore + +RUN cd libosmocore \ + && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \ + && autoreconf -fi \ + && ./configure \ + --disable-doxygen \ + --disable-pcsc \ + --prefix=/usr \ + && make -j5 \ + && make install \ + && make distclean + +RUN git clone git://git.osmocom.org/gr-gsm +ADD http://git.osmocom.org/gr-gsm/patch?h=$GR_GSM_BRANCH /tmp/commit-gr-gsm + +RUN cd gr-gsm \ + && git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \ + && mkdir build/ \ + && cd build/ \ + && cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -Wno-dev \ + ../ \ + && make -j5 \ + && make install \ + && cd ../ \ + && rm -rf build/ + +# Remove build dependencies +RUN pacman -Rs --noconfirm \ + $BUILD_DEPS diff --git a/gr-gsm-master/Makefile b/gr-gsm-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/gr-gsm-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/10410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I115b59dc9eaec5d132f3f64c4ee321173459e9ed Gerrit-Change-Number: 10410 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:00:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 9 Aug 2018 11:00:37 +0000 Subject: Change in osmo-gsm-tester[master]: bts_nanobts: Fix pwsup_list increasing its size every new test Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10411 Change subject: bts_nanobts: Fix pwsup_list increasing its size every new test ...................................................................... bts_nanobts: Fix pwsup_list increasing its size every new test variables under class section are shared among all instances, and are used unless the specific class instance attribute is set. As a result, the same pwsup_list object was being re-used. Take the chance to do the same with the _pcu var, since we want same behavior for it. See for reference: https://stackoverflow.com/a/1716730 Change-Id: I3f6a9d64b35aec33430e90872f41c3d046653ce6 --- M src/osmo_gsm_tester/bts_nanobts.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/11/10411/1 diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index 7f0151f..a18f205 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -28,13 +28,13 @@ class NanoBts(bts.Bts): - pwsup_list = [] - _pcu = None ############## # PROTECTED ############## def __init__(self, suite_run, conf): super().__init__(suite_run, conf, 'nanobts_%s' % conf.get('label', 'nolabel'), 'nanobts') + self.pwsup_list = [] + self._pcu = None def _configure(self): if self.bsc is None: -- To view, visit https://gerrit.osmocom.org/10411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3f6a9d64b35aec33430e90872f41c3d046653ce6 Gerrit-Change-Number: 10411 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 9 Aug 2018 11:01:34 +0000 Subject: Change in osmo-gsm-tester[master]: bts_nanobts: Fix pwsup_list increasing its size every new test In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10411 ) Change subject: bts_nanobts: Fix pwsup_list increasing its size every new test ...................................................................... bts_nanobts: Fix pwsup_list increasing its size every new test variables under class section are shared among all instances, and are used unless the specific class instance attribute is set. As a result, the same pwsup_list object was being re-used. Take the chance to do the same with the _pcu var, since we want same behavior for it. See for reference: https://stackoverflow.com/a/1716730 Fixes: OS#3456 Change-Id: I3f6a9d64b35aec33430e90872f41c3d046653ce6 --- M src/osmo_gsm_tester/bts_nanobts.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/11/10411/2 -- To view, visit https://gerrit.osmocom.org/10411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3f6a9d64b35aec33430e90872f41c3d046653ce6 Gerrit-Change-Number: 10411 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:04:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:04:30 +0000 Subject: Change in osmo-gsm-tester[master]: bts_nanobts: Fix pwsup_list increasing its size every new test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10411 ) Change subject: bts_nanobts: Fix pwsup_list increasing its size every new test ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f6a9d64b35aec33430e90872f41c3d046653ce6 Gerrit-Change-Number: 10411 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 09 Aug 2018 11:04:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:05:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:05:15 +0000 Subject: Change in docker-playground[master]: Introduce Dockerfile for the GR-GSM project In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10410 ) Change subject: Introduce Dockerfile for the GR-GSM project ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I115b59dc9eaec5d132f3f64c4ee321173459e9ed Gerrit-Change-Number: 10410 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Thu, 09 Aug 2018 11:05:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:05:49 +0000 Subject: Change in mncc-python[master]: recommend stock Debian/Ubuntu package for fysom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10409 ) Change subject: recommend stock Debian/Ubuntu package for fysom ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59e3b93c1d3f849f14dcb2344f6f033312331884 Gerrit-Change-Number: 10409 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 09 Aug 2018 11:05:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:05:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:05:53 +0000 Subject: Change in mncc-python[master]: recommend stock Debian/Ubuntu package for fysom In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10409 ) Change subject: recommend stock Debian/Ubuntu package for fysom ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59e3b93c1d3f849f14dcb2344f6f033312331884 Gerrit-Change-Number: 10409 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 09 Aug 2018 11:05:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:05:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:05:54 +0000 Subject: Change in mncc-python[master]: recommend stock Debian/Ubuntu package for fysom In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10409 ) Change subject: recommend stock Debian/Ubuntu package for fysom ...................................................................... recommend stock Debian/Ubuntu package for fysom fysom is now available as a regular Debian/Ubuntu package so there is no need anymore to install it via pip: https://packages.debian.org/stretch/python-fysom https://packages.ubuntu.com/bionic/python-fysom Change-Id: I59e3b93c1d3f849f14dcb2344f6f033312331884 --- M README 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/README b/README index e1f68be..4645559 100644 --- a/README +++ b/README @@ -12,9 +12,7 @@ mncc-python needs python-pykka, and fysom. On Debian or Ubuntu you can install them via - sudo apt-get install python-pykka python-pip - sudo pip install fysom - + sudo apt-get install python-pykka python-fysom = Getting the code = -- To view, visit https://gerrit.osmocom.org/10409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I59e3b93c1d3f849f14dcb2344f6f033312331884 Gerrit-Change-Number: 10409 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:06:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:06:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: check local port only once In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10408 ) Change subject: mgcp_client: check local port only once ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic1fd1018d68fcac94961321615bfdd726465532d Gerrit-Change-Number: 10408 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 11:06:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:06:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:06:27 +0000 Subject: Change in osmo-mgw[master]: mgcp_client: check local port only once In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10408 ) Change subject: mgcp_client: check local port only once ...................................................................... mgcp_client: check local port only once When the user has set a local port for the mgcp client we want the client to exit if this port is already occupied. If no port is set the IETF default port is configured automatically. When we find this port occupied we try up to 100 times the next port to find a useable port. Since the for loop that controls the attempts always sets the port config it uses for its checks it will mistakenly assume that the user has set a port on the second cycle. - Make sure we only check for the default port in the first cycle Change-Id: Ic1fd1018d68fcac94961321615bfdd726465532d --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 3663163..c10abc9 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -801,7 +801,7 @@ * configured then we assume that the user has choosen * that port conciously and we will not try to resolve * this by silently choosing a different port. */ - if (mgcp->actual.local_port != MGCP_CLIENT_LOCAL_PORT_DEFAULT) + if (mgcp->actual.local_port != MGCP_CLIENT_LOCAL_PORT_DEFAULT && i == 0) return -EINVAL; /* Choose a new port number to try next */ -- To view, visit https://gerrit.osmocom.org/10408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic1fd1018d68fcac94961321615bfdd726465532d Gerrit-Change-Number: 10408 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:08:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:08:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10372 ) Change subject: add DTX fill frame BTS tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 09 Aug 2018 11:08:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:08:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:08:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add DTX fill frame BTS tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10372 ) Change subject: add DTX fill frame BTS tests ...................................................................... add DTX fill frame BTS tests Add tests TC_tch_sign_l2_fill_frame and TC_tch_sign_l2_fill_frame_dtxd. TC_tch_sign_l2_fill_frame is already passing and verifies that fill frames are sent if there is nothing else to transmit on a SDCCH4/SDCCH8, TCH/H, or TCH/F signalling channel where DTX is disabled for downlink. TC_tch_sign_l2_fill_frame_dtxd is currently failing. It verifies that only specific fill frames are sent, as required by GSM 05.08 for TCHF signalling channels with DTX enabled for downlink. At present, our implementation generates no fill frames in this case, which is one piece of the problem described in issue OS#1950. Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Related: OS#1950 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml M library/RSL_Types.ttcn 3 files changed, 196 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fb6137c..890be91 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3794,6 +3794,187 @@ f_assert_lapdm('03e00d063505'O, tr_LAPDm_I(0, true, false, 7, 0, '063505'O), "I/7/0"); } +/*********************************************************************** + * DTX Related (see GSM 05.08, section 8.3) + ***********************************************************************/ + +/* XXX These functions must be kept in sync with g_AllChannels defined on test_CT. */ +function f_g_chan_is_tchf() runs on ConnHdlr return boolean { + return (g_chan_nr == valueof(ts_RslChanNr_Bm(1)) or + g_chan_nr == valueof(ts_RslChanNr_Bm(2)) or + g_chan_nr == valueof(ts_RslChanNr_Bm(3)) or + g_chan_nr == valueof(ts_RslChanNr_Bm(4))); +} +function f_g_chan_is_tchh() runs on ConnHdlr return boolean { + return (g_chan_nr == valueof(ts_RslChanNr_Lm(5,0)) or + g_chan_nr == valueof(ts_RslChanNr_Lm(5,1))); +} +function f_g_chan_is_sdcch4() runs on ConnHdlr return boolean { + return (g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,0)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,1)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,2)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,3))); +} +function f_g_chan_is_sdcch8() runs on ConnHdlr return boolean { + return (g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,0)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,1)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,2)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,3)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,4)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,5)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,6)) or + g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,7))); +} + +function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr { + var L1ctlDlMessage dl; + var octetstring l2_fill_frame := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O; + var octetstring l2_fill_frame_sacch := substr(l2_fill_frame, 0, lengthof(l2_fill_frame) - 2); + var GsmFrameNumber first_fn; + var boolean is_first_frame := true; + var integer nfill_frames := 0; + const integer dtx_tchf_mod := 104; + /* Frames numbers (mod 104) for which a fill frame is expected on TCHF if DTX is enabled. */ + var Integers required_tdma_frames_dtx_tchf := { 52, 53, 54, 55, 56, 57, 58, 59 }; + timer T := 5.0; + + f_l1_tune(L1CTL); + RSL.clear; + L1CTL.clear; + + /* activate TCHF signalling channel */ + f_est_dchan(false); + + T.start; + alt { + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var GsmFrameNumber fn := dl.dl_info.frame_nr; + var octetstring l2 := dl.payload.data_ind.payload; + + if (is_first_frame) { + is_first_frame := false; + first_fn := dl.dl_info.frame_nr; + } + + if (dl.dl_info.link_id.c == SACCH) { + l2 := substr(l2, 2, lengthof(l2) - 2); /* remove L1 header */ + if (not match(l2_fill_frame_sacch, l2)) { + repeat; + } + } else if (not match(l2_fill_frame, l2)) { + repeat; + } + + if (dtxd) { + if (not f_g_chan_is_tchf()) { + T.stop; + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + setverdict(fail, "Received fill frame on non-TCH/F channel; DTX is only allowed on TCH/F!"); + } + if (fn >= first_fn + dtx_tchf_mod) { + T.stop; + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + /* With DTX enabled we can expect at least 1 fill frame every 104 frames. */ + if (nfill_frames < 1) { + setverdict(fail); + } else { + setverdict(pass); + } + } + for (var integer i := 0; i < lengthof(required_tdma_frames_dtx_tchf); i := i + 1) { + if (fn mod dtx_tchf_mod == required_tdma_frames_dtx_tchf[i]) { + nfill_frames := nfill_frames + 1; + repeat; + } + } + log("Received DTX TCH fill frame with bad frame number: ", fn, + " (mod ", dtx_tchf_mod, ": ", fn mod dtx_tchf_mod, ")"); + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + setverdict(fail, "Unexpected L2 fill frame received on Um"); + } else { + nfill_frames := nfill_frames + 1; + if (fn >= first_fn + dtx_tchf_mod) { + var integer expected_fill_frames; + T.stop; + if (f_g_chan_is_tchf()) { + /* Without DTX we can expect 25 fill frames for every 104 frames. + * (24 FACCH + 1 SACCH filling) */ + expected_fill_frames := 25; + } else if (f_g_chan_is_tchh()) { + /* We can expect 2 fill frames for every 104 frames. */ + expected_fill_frames := 2; + } else if (f_g_chan_is_sdcch4() or f_g_chan_is_sdcch8()) { + /* We can expect 5 fill frames for every 104 frames. */ + expected_fill_frames := 5; + } else { + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + setverdict(fail, "Unknown channel type"); + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + if (nfill_frames >= expected_fill_frames) { + setverdict(pass); + } else { + setverdict(fail, "Not enough fill frames received"); + } + } else { + repeat; + } + } + } + [] L1CTL.receive { repeat; } + [] T.timeout { + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + setverdict(fail, "Timeout waiting for L2 fill frames on Um"); + mtc.stop; + } + } +} + +function f_TC_tch_sign_l2_fill_frame(charstring id) runs on ConnHdlr { + f_test_l2_fill_frames(false); +} + +function f_TC_tch_sign_l2_fill_frame_dtxd(charstring id) runs on ConnHdlr { + f_test_l2_fill_frames(true); +} + +function f_tch_sign_l2_fill_frame(boolean dtxd) runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + pars.t_guard := 60.0; + f_init(testcasename()); + for (var integer i := 0; i < sizeof(g_AllChannels); i := i + 1) { + pars := valueof(t_Pars(g_AllChannels[i], ts_RSL_ChanMode_SIGN(dtxd))); + if (dtxd) { + if (i >= 4) { /* DTX is only allowed on TCH/F */ + break; + } + vc_conn := f_start_handler(refers(f_TC_tch_sign_l2_fill_frame_dtxd), pars); + } else { + vc_conn := f_start_handler(refers(f_TC_tch_sign_l2_fill_frame), pars); + } + vc_conn.done; + } +} + +/* Verify that L2 fill frames are sent on TCH in signaling mode if + * there is nothing to transmit while DTX is disabled on downlink. */ +testcase TC_tch_sign_l2_fill_frame() runs on test_CT { + f_tch_sign_l2_fill_frame(false); +} + +/* Verify that particular L2 fill frames are sent on TCH in signaling mode if + * there is nothing to transmit while DTX is enabled on downlink. */ +testcase TC_tch_sign_l2_fill_frame_dtxd() runs on test_CT { + f_tch_sign_l2_fill_frame(true); +} /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ @@ -3926,6 +4107,9 @@ execute( TC_encr_cmd_a53() ); execute( TC_lapdm_selftest() ); + + execute( TC_tch_sign_l2_fill_frame() ); + execute( TC_tch_sign_l2_fill_frame_dtxd() ); } diff --git a/bts/expected-results.xml b/bts/expected-results.xml index d1a65a3..8bfd305 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -85,4 +85,11 @@ + + + "Unexpected L2 fill frame received on Um" + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_tch_sign_l2_fill_frame_dtxd testcase + + diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index d4d0c4d..95a7b1f 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -325,20 +325,21 @@ RSL_SpeechAlgo coding_alg_rate } with { variant (len) "LENGTHTO(reserved,dtx_d,dtx_u,spd_ind,ch_rate_type,coding_alg_rate)" } - template (value) RSL_IE_ChannelMode ts_RSL_ChanMode_SIGN := { + template (value) RSL_IE_ChannelMode ts_RSL_ChanMode_SIGN(boolean dtx_downlink := false) := { len := 0, /* overwritten */ reserved := '000000'B, - dtx_d := false, + dtx_d := dtx_downlink, dtx_u := false, spd_ind := RSL_SPDI_SIGN, ch_rate_type := RSL_CHRT_SDCCH, coding_alg_rate := RSL_CMOD_NO_RESOURCE } - template (value) RSL_IE_ChannelMode ts_RSL_ChanMode(RSL_ChanRateType t, RSL_SpeechAlgo alg) := { + template (value) RSL_IE_ChannelMode ts_RSL_ChanMode(RSL_ChanRateType t, RSL_SpeechAlgo alg, + boolean dtx_downlink := false) := { len := 0, /* overwritten */ reserved := '000000'B, - dtx_d := false, + dtx_d := dtx_downlink, dtx_u := false, spd_ind := RSL_SPDI_SPEECH, ch_rate_type := t, -- To view, visit https://gerrit.osmocom.org/10372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4e0de6e78b62cd408f600a57a28617d91da64af Gerrit-Change-Number: 10372 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:09:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:09:27 +0000 Subject: Change in osmo-ci[master]: obs-nightly: introduce osmo-trx-debian8-jessie In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10277 ) Change subject: obs-nightly: introduce osmo-trx-debian8-jessie ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8477b580976b376ee5abdde98a651d47199ef6d9 Gerrit-Change-Number: 10277 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 09 Aug 2018 11:09:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:09:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:09:52 +0000 Subject: Change in osmo-trx[master]: debian: add patches for debian8 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10276 ) Change subject: debian: add patches for debian8 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I261302d2ed16e76540073589504e7426e23d00a1 Gerrit-Change-Number: 10276 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 11:09:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:09:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:09:53 +0000 Subject: Change in osmo-trx[master]: debian: add patches for debian8 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10276 ) Change subject: debian: add patches for debian8 ...................................................................... debian: add patches for debian8 The osmocom-nightly/release can create debian8 package by patching rules and control files Change-Id: I261302d2ed16e76540073589504e7426e23d00a1 --- A debian/patches/build-for-debian8.patch A debian/patches/series 2 files changed, 58 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch new file mode 100644 index 0000000..d44eb2f --- /dev/null +++ b/debian/patches/build-for-debian8.patch @@ -0,0 +1,57 @@ +Index: osmo-trx/debian/control +=================================================================== +--- osmo-trx.orig/debian/control ++++ osmo-trx/debian/control +@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9), + libfftw3-dev, + libtalloc-dev, + libusrp-dev, +- liblimesuite-dev, + libosmocore-dev (>= 0.10.0) + Standards-Version: 3.9.6 + Vcs-Browser: http://cgit.osmocom.org/osmo-trx +@@ -29,7 +28,7 @@ Package: osmo-trx-dbg + Architecture: any + Section: debug + Priority: extra +-Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), osmo-trx-lms (= ${binary:Version}), ${misc:Depends} ++Depends: osmo-trx-uhd (= ${binary:Version}), osmo-trx-usrp1 (= ${binary:Version}), ${misc:Depends} + Description: Debug symbols for the osmo-trx-* + Make debugging possible + +@@ -70,22 +70,3 @@ Description: SDR transceiver that implem + 3GPP is the "3rd Generation Partnership Project" which is the collaboration + between different telecommunication associations for developing new + generations of mobile phone networks. (post-2G/GSM) +- +-Package: osmo-trx-lms +-Architecture: any +-Depends: ${shlibs:Depends}, ${misc:Depends} +-Description: SDR transceiver that implements Layer 1 of a GSM BTS (LimeSuite) +- OsmoTRX is a software-defined radio transceiver that implements the Layer 1 +- physical layer of a BTS comprising the following 3GPP specifications: +- . +- TS 05.01 "Physical layer on the radio path" +- TS 05.02 "Multiplexing and Multiple Access on the Radio Path" +- TS 05.04 "Modulation" +- TS 05.10 "Radio subsystem synchronization" +- . +- In this context, BTS is "Base transceiver station". It's the stations that +- connect mobile phones to the mobile network. +- . +- 3GPP is the "3rd Generation Partnership Project" which is the collaboration +- between different telecommunication associations for developing new +- generations of mobile phone networks. (post-2G/GSM) +Index: osmo-trx/debian/rules +=================================================================== +--- osmo-trx.orig/debian/rules ++++ osmo-trx/debian/rules +@@ -9,7 +9,7 @@ override_dh_shlibdeps: + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + + override_dh_auto_configure: +- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms ++ dh_auto_configure -- --with-uhd --with-usrp1 + + override_dh_strip: + dh_strip --dbg-package=osmo-trx-dbg diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..82063b7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +# build-for-debian8.patch -- To view, visit https://gerrit.osmocom.org/10276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I261302d2ed16e76540073589504e7426e23d00a1 Gerrit-Change-Number: 10276 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:11:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:11:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: rework TC_attach_closed_add_vty to be executed in a single BSSG... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10391 ) Change subject: sgsn: rework TC_attach_closed_add_vty to be executed in a single BSSGP_ConnHldr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e5ae832f3908a172b9beb6d936074b806e0c799 Gerrit-Change-Number: 10391 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 11:11:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:13:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:13:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10392 ) Change subject: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10392/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/10392/1/sgsn/SGSN_Tests.ttcn at 1944 PS1, Line 1944: } do you have a 'default activated altstep somewhere? I'm asking as I don't see any "catch-all" clause here that would e.g. catch any other L3 PDU received from the SGSN. In such situations, we would block until the guard timer times out and fail with a very nondescript error message. As default-activated altsteps are somewhat un-obvious, an explicit altstep invocation like might be the best option. Avoids copying code around, while still making it explicit which alternatives exist in an alt{} [] as_any_other_l3(); -- To view, visit https://gerrit.osmocom.org/10392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 Gerrit-Change-Number: 10392 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 11:13:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:51:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 9 Aug 2018 11:51:26 +0000 Subject: Change in docker-playground[master]: Introduce Dockerfile for the GR-GSM project In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10410 ) Change subject: Introduce Dockerfile for the GR-GSM project ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I115b59dc9eaec5d132f3f64c4ee321173459e9ed Gerrit-Change-Number: 10410 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 09 Aug 2018 11:51:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:51:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 9 Aug 2018 11:51:36 +0000 Subject: Change in docker-playground[master]: Introduce Dockerfile for the GR-GSM project In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10410 ) Change subject: Introduce Dockerfile for the GR-GSM project ...................................................................... Introduce Dockerfile for the GR-GSM project This change introduces a new sub-project - 'gr-gsm-master'. It was decided to use Arch Linux as the base image, because it provides the recent version of both UHD and GNU Radio without tons of dependencies, such as Xorg. Note: as there in no libosmocore package in Arch Linux, it will be built from the latest source code. Change-Id: I115b59dc9eaec5d132f3f64c4ee321173459e9ed --- M Makefile A gr-gsm-master/.release A gr-gsm-master/Dockerfile A gr-gsm-master/Makefile 4 files changed, 88 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Verified diff --git a/Makefile b/Makefile index 2cdbc58..f82e3f5 100644 --- a/Makefile +++ b/Makefile @@ -68,3 +68,7 @@ .PHONY: m3ua-test m3ua-test: osmo-stp-master sigtran-tests $(MAKE) -C m3ua-test + +.PHONY: gr-gsm-master +gr-gsm-master: + $(MAKE) -C gr-gsm-master diff --git a/gr-gsm-master/.release b/gr-gsm-master/.release new file mode 100644 index 0000000..3e94f0e --- /dev/null +++ b/gr-gsm-master/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=gr-gsm-master-0.0.0 diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile new file mode 100644 index 0000000..e75d318 --- /dev/null +++ b/gr-gsm-master/Dockerfile @@ -0,0 +1,81 @@ +FROM base/archlinux + +MAINTAINER Vadim Yanitskiy + +ARG LIBOSMOCORE_BRANCH="master" +ARG GR_GSM_BRANCH="fixeria/trx" + +# Build dependencies +ENV BUILD_DEPS \ + automake \ + autoconf \ + libtool \ + pkgconf \ + cmake \ + make \ + swig \ + gcc + +# Sync pacman +RUN pacman -Syu + +# Install persistent packages +RUN pacman -S --needed --noconfirm \ + gnuradio \ + python2 \ + python2-scipy \ + python2-requests \ + talloc \ + boost + +# Download USRP firmware +RUN uhd_images_downloader + +# Install build dependencies +RUN pacman -S --needed --noconfirm \ + $BUILD_DEPS + +# Make Python2 default +RUN ln -s /usr/bin/python2 /usr/bin/python + +# Install and configure git +RUN pacman -S --needed --noconfirm git \ + && git config --global user.email docker at dock.er \ + && git config --global user.name "Dock Er" + +WORKDIR /tmp + +# Download, build and install libosmocore +RUN git clone git://git.osmocom.org/libosmocore +ADD http://git.osmocom.org/libosmocore/patch?h=$LIBOSMOCORE_BRANCH /tmp/commit-libosmocore + +RUN cd libosmocore \ + && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \ + && autoreconf -fi \ + && ./configure \ + --disable-doxygen \ + --disable-pcsc \ + --prefix=/usr \ + && make -j5 \ + && make install \ + && make distclean + +RUN git clone git://git.osmocom.org/gr-gsm +ADD http://git.osmocom.org/gr-gsm/patch?h=$GR_GSM_BRANCH /tmp/commit-gr-gsm + +RUN cd gr-gsm \ + && git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \ + && mkdir build/ \ + && cd build/ \ + && cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -Wno-dev \ + ../ \ + && make -j5 \ + && make install \ + && cd ../ \ + && rm -rf build/ + +# Remove build dependencies +RUN pacman -Rs --noconfirm \ + $BUILD_DEPS diff --git a/gr-gsm-master/Makefile b/gr-gsm-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/gr-gsm-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/10410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I115b59dc9eaec5d132f3f64c4ee321173459e9ed Gerrit-Change-Number: 10410 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:52:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:52:10 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... Patch Set 5: review comment to patch 2 still pending -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 11:52:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:52:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:52:51 +0000 Subject: Change in osmo-msc[master]: doc: update mgw settings in example config file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10240 ) Change subject: doc: update mgw settings in example config file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I17453e0d30eec757aba9530b63eb5d1539cbdffc Gerrit-Change-Number: 10240 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 11:52:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:52:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:52:53 +0000 Subject: Change in osmo-msc[master]: doc: update mgw settings in example config file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10240 ) Change subject: doc: update mgw settings in example config file ...................................................................... doc: update mgw settings in example config file This example configuration files lack port settings for the mgcp client. Lets explicitly assign a port for the MGW and a local port. For the local port lets use the IETF port number + 1. The reason for this is that the default config for osmo-bsc already uses the IETF port and in osmo-bsc and osmo-msc run on the same machine in many setups. Change-Id: I17453e0d30eec757aba9530b63eb5d1539cbdffc --- M doc/examples/osmo-msc/osmo-msc.cfg M doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg M doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-msc/osmo-msc.cfg b/doc/examples/osmo-msc/osmo-msc.cfg index 91c9eee..f80143d 100644 --- a/doc/examples/osmo-msc/osmo-msc.cfg +++ b/doc/examples/osmo-msc/osmo-msc.cfg @@ -14,6 +14,8 @@ mm info 1 msc mgw remote-ip 10.23.24.1 + mgw remote-port 2427 + mgw local-port 2728 assign-tmsi auth-tuple-max-reuse-count 3 auth-tuple-reuse-on-error 1 diff --git a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg index 0b9fd2a..39ca9d4 100644 --- a/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg +++ b/doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg @@ -22,4 +22,6 @@ cs7-instance-a 0 cs7-instance-iu 0 mgw remote-ip 10.23.24.1 + mgw remote-port 2427 + mgw local-port 2728 assign-tmsi diff --git a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg index 44ac3f8..2af1726 100644 --- a/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg +++ b/doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg @@ -24,4 +24,6 @@ cs7-instance-a 0 cs7-instance-iu 1 mgw remote-ip 10.23.24.1 + mgw remote-port 2427 + mgw local-port 2728 assign-tmsi -- To view, visit https://gerrit.osmocom.org/10240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I17453e0d30eec757aba9530b63eb5d1539cbdffc Gerrit-Change-Number: 10240 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:53:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:53:42 +0000 Subject: Change in osmo-bsc[master]: doc: update mgw settings in example config file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10239 ) Change subject: doc: update mgw settings in example config file ...................................................................... Patch Set 1: Code-Review-1 do we want this? This would make it impossible to run bsc + msc on the same machine using the example configs, right? -- To view, visit https://gerrit.osmocom.org/10239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b1c5097d98ec2ab97d51f99b1105db3de85c75f Gerrit-Change-Number: 10239 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 09 Aug 2018 11:53:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:54:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:54:11 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Changes In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/9210 ) Change subject: Minor Typo Changes ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/9210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I69126638d81d98ce8236cae543515c8dc743f404 Gerrit-Change-Number: 9210 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:54:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:54:54 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Fixes In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/9209 ) Change subject: Minor Typo Fixes ...................................................................... Abandoned no follow-up from submitter in 3 months, abandoning -- To view, visit https://gerrit.osmocom.org/9209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ie5b1e0f23df23d5831059a1c3c9b16ee89963612 Gerrit-Change-Number: 9209 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 11:56:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 9 Aug 2018 11:56:23 +0000 Subject: Change in osmo-mgw[master]: add a VTY command which shows a specific mgcp endpoint In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10022 ) Change subject: add a VTY command which shows a specific mgcp endpoint ...................................................................... Patch Set 1: ping? -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 09 Aug 2018 11:56:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 12:09:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 9 Aug 2018 12:09:15 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Makefile: enable host USB access Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10412 Change subject: gr-gsm-master/Makefile: enable host USB access ...................................................................... gr-gsm-master/Makefile: enable host USB access Privileged USB access is required for direct communication between the image's UHD driver and a host's USRP device. Change-Id: I8170d2c31b4e28f6a406c50b10b7626f70f36d28 --- M gr-gsm-master/Makefile 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/12/10412/1 diff --git a/gr-gsm-master/Makefile b/gr-gsm-master/Makefile index 8d0e10b..b030a43 100644 --- a/gr-gsm-master/Makefile +++ b/gr-gsm-master/Makefile @@ -1 +1,5 @@ +RUN_ARGS?= \ + --privileged \ + -v /dev/bus/usb:/dev/bus/usb + include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/10412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8170d2c31b4e28f6a406c50b10b7626f70f36d28 Gerrit-Change-Number: 10412 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 12:09:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 9 Aug 2018 12:09:43 +0000 Subject: Change in osmo-gsm-tester[master]: Cleanup of class scoped variables Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10413 Change subject: Cleanup of class scoped variables ...................................................................... Cleanup of class scoped variables After bug described in OS#3456 and fixed in last commit, let's categorize and place variables in its correct plac to avoid similar issus. We leave under the class keyword (class scoped variables) the attributes which are to be used as static class attributes. All other ones are initialized during __init__(). This way w avoid scenarios in which while using an object from an instance attribute we end up reading a class scoped variable which is shared among all instances. Change-Id: I5ad4cac34a9f49eaf42966c01c9c5a4d3f3e9dc8 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/esme.py M src/osmo_gsm_tester/event_loop.py M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/osmo_bsc.py M src/osmo_gsm_tester/osmo_ggsn.py M src/osmo_gsm_tester/osmo_hlr.py M src/osmo_gsm_tester/osmo_mgcpgw.py M src/osmo_gsm_tester/osmo_mgw.py M src/osmo_gsm_tester/osmo_msc.py M src/osmo_gsm_tester/osmo_nitb.py M src/osmo_gsm_tester/osmo_sgsn.py M src/osmo_gsm_tester/osmo_stp.py M src/osmo_gsm_tester/osmocon.py M src/osmo_gsm_tester/pcu.py M src/osmo_gsm_tester/pcu_osmo.py M src/osmo_gsm_tester/pcu_sysmo.py M src/osmo_gsm_tester/process.py M src/osmo_gsm_tester/sms.py M src/osmo_gsm_tester/smsc.py M src/osmo_gsm_tester/suite.py M src/osmo_gsm_tester/test.py M src/osmo_gsm_tester/trial.py 27 files changed, 92 insertions(+), 145 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/10413/1 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 0f3ef1c..041b2bc 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -25,24 +25,21 @@ from . import log, config, util, template, process, schema, pcu_osmo class Bts(log.Origin, metaclass=ABCMeta): - suite_run = None - conf = None - bsc = None - sgsn = None - lac = None - rac = None - cellid = None - bvci = None - defaults_cfg_name = None - _num_trx = 1 - _max_trx = None - overlay_trx_list = [] ############## # PROTECTED ############## def __init__(self, suite_run, conf, name, defaults_cfg_name): super().__init__(log.C_RUN, name) + self.bsc = None + self.sgsn = None + self.lac = None + self.rac = None + self.cellid = None + self.bvci = None + self._num_trx = 1 + self._max_trx = None + self.overlay_trx_list = [] self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index 318c30d..f1a0ce8 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -27,16 +27,14 @@ ############## # PROTECTED ############## - run_dir = None - inst = None - env = None BIN_BTS_OCTPHY = 'osmo-bts-octphy' - CONF_BTS_OCTPHY = 'osmo-bts-octphy.cfg' def __init__(self, suite_run, conf): super().__init__(suite_run, conf, OsmoBtsOctphy.BIN_BTS_OCTPHY, 'osmo_bts_octphy') + self.run_dir = None + self.inst = None self.env = {} self.values = {} diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index b9b7fef..32784bd 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -24,14 +24,14 @@ from . import log, config, util, template, process, bts, pcu_osmo class OsmoBts(bts.Bts, metaclass=ABCMeta): - proc_bts = None - _pcu = None ############## # PROTECTED ############## def __init__(self, suite_run, conf, name, defaults_cfg_name): super().__init__(suite_run, conf, name, defaults_cfg_name) + self._pcu = None + self.proc_bts = None if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) @@ -75,9 +75,9 @@ ############## # PROTECTED ############## - pcu_sk_tmp_dir = None def __init__(self, suite_run, conf, name, defaults_cfg_name): + self.pcu_sk_tmp_dir = None super().__init__(suite_run, conf, name, defaults_cfg_name) ######################## diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index b9310f8..1584eb2 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -27,10 +27,6 @@ ############## # PROTECTED ############## - run_dir = None - inst = None - env = None - trx = None BIN_BTS_TRX = 'osmo-bts-trx' BIN_PCU = 'osmo-pcu' @@ -39,6 +35,9 @@ def __init__(self, suite_run, conf): super().__init__(suite_run, conf, OsmoBtsTrx.BIN_BTS_TRX, 'osmo_bts_trx') + self.run_dir = None + self.inst = None + self.trx = None self.env = {} def trx_remote_ip(self): diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index 65c9279..e3f4823 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -25,10 +25,6 @@ ############## # PROTECTED ############## - run_dir = None - inst = None - remote_inst = None - remote_dir = None REMOTE_DIR = '/osmo-gsm-tester-bts' BTS_SYSMO_BIN = 'osmo-bts-sysmo' @@ -36,6 +32,10 @@ def __init__(self, suite_run, conf): super().__init__(suite_run, conf, SysmoBts.BTS_SYSMO_BIN, 'osmo_bts_sysmo') + self.run_dir = None + self.inst = None + self.remote_inst = None + self.remote_dir = None self.remote_user = 'root' def _direct_pcu_enabled(self): diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/esme.py index 78421f6..9653fbf 100644 --- a/src/osmo_gsm_tester/esme.py +++ b/src/osmo_gsm_tester/esme.py @@ -34,8 +34,6 @@ MAX_PASSWD_LEN = 16 class Esme(log.Origin): - client = None - smsc = None MSGMODE_TRANSACTION = smpplib.consts.SMPP_MSGMODE_FORWARD MSGMODE_STOREFORWARD = smpplib.consts.SMPP_MSGMODE_STOREFORWARD @@ -45,6 +43,8 @@ # Get last characters of msisdn to stay inside MAX_SYS_ID_LEN. Similar to modulus operator. self.set_system_id('esme-' + self.msisdn[-11:]) super().__init__(log.C_TST, self.system_id) + self.client = None + self.smsc = None self.set_password('esme-pwd') self.connected = False self.bound = False diff --git a/src/osmo_gsm_tester/event_loop.py b/src/osmo_gsm_tester/event_loop.py index 0f647c2..fe88ef4 100644 --- a/src/osmo_gsm_tester/event_loop.py +++ b/src/osmo_gsm_tester/event_loop.py @@ -23,10 +23,12 @@ from . import log class DeferredHandling: - defer_queue = [] + + def __init__(self): + self.defer_queue = [] def handle_queue(self): - while DeferredHandling.defer_queue: + while self.defer_queue: handler, args, kwargs = self.defer_queue.pop(0) handler(*args, **kwargs) @@ -34,10 +36,10 @@ self.defer_queue.append((handler, args, kwargs)) class WaitRequest: - timeout_ack = False - condition_ack = False def __init__(self, condition, condition_args, condition_kwargs, timeout, timestep): + self.timeout_ack = False + self.condition_ack = False self.timeout_started = time.time() self.timeout = timeout self.condition = condition @@ -53,12 +55,9 @@ self.timeout_ack = True class EventLoop: - poll_funcs = [] - gloop = None - gctx = None - deferred_handling = None def __init__(self): + self.poll_funcs = [] self.gloop = GLib.MainLoop() self.gctx = self.gloop.get_context() self.deferred_handling = DeferredHandling() diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index 59fcc76..d0bbf23 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -321,10 +321,6 @@ class Modem(log.Origin): 'convenience for ofono Modem interaction' - msisdn = None - sms_received_list = None - _ki = None - _imsi = None CTX_PROT_IPv4 = 'ip' CTX_PROT_IPv6 = 'ipv6' @@ -336,6 +332,9 @@ self.dbuspath = get_dbuspath_from_syspath(self.syspath) super().__init__(log.C_TST, self.dbuspath) self.dbg('creating from syspath %s', self.syspath) + self.msisdn = None + self._ki = None + self._imsi = None self.sms_received_list = [] self.dbus = ModemDbusInteraction(self.dbuspath) self.register_attempts = 0 diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py index 323b9ec..0e5bbbe 100644 --- a/src/osmo_gsm_tester/osmo_bsc.py +++ b/src/osmo_gsm_tester/osmo_bsc.py @@ -24,19 +24,14 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoBsc(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - bts = None - encryption = None - rsl_ip = None - mgw = None - stp = None def __init__(self, suite_run, msc, mgw, stp, ip_address): super().__init__(log.C_RUN, 'osmo-bsc_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.encryption = None + self.rsl_ip = None self.suite_run = suite_run self.ip_address = ip_address self.bts = [] diff --git a/src/osmo_gsm_tester/osmo_ggsn.py b/src/osmo_gsm_tester/osmo_ggsn.py index 9f23c64..2fdc792 100644 --- a/src/osmo_gsm_tester/osmo_ggsn.py +++ b/src/osmo_gsm_tester/osmo_ggsn.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoGgsn(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-ggsn_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address diff --git a/src/osmo_gsm_tester/osmo_hlr.py b/src/osmo_gsm_tester/osmo_hlr.py index 635f711..a4633e3 100644 --- a/src/osmo_gsm_tester/osmo_hlr.py +++ b/src/osmo_gsm_tester/osmo_hlr.py @@ -25,8 +25,6 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoHlr(log.Origin): - suite_run = None - ip_address = None run_dir = None config_file = None process = None @@ -34,9 +32,12 @@ def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-hlr_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.next_subscriber_id = 1 self.suite_run = suite_run self.ip_address = ip_address - self.bts = [] def start(self): self.log('Starting osmo-hlr') diff --git a/src/osmo_gsm_tester/osmo_mgcpgw.py b/src/osmo_gsm_tester/osmo_mgcpgw.py index bebb9d5..82b9149 100644 --- a/src/osmo_gsm_tester/osmo_mgcpgw.py +++ b/src/osmo_gsm_tester/osmo_mgcpgw.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoMgcpgw(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address, bts_ip): super().__init__(log.C_RUN, 'osmo-mgcpgw_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address # hack: so far mgcpgw needs one specific BTS IP. diff --git a/src/osmo_gsm_tester/osmo_mgw.py b/src/osmo_gsm_tester/osmo_mgw.py index abac4aa..1d5596e 100644 --- a/src/osmo_gsm_tester/osmo_mgw.py +++ b/src/osmo_gsm_tester/osmo_mgw.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoMgw(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-mgw_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/osmo_msc.py index 0e458fe..192926c 100644 --- a/src/osmo_gsm_tester/osmo_msc.py +++ b/src/osmo_gsm_tester/osmo_msc.py @@ -23,20 +23,15 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc class OsmoMsc(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - hlr = None - config = None - smsc = None - stp = None - encryption = None - authentication = None def __init__(self, suite_run, hlr, mgw, stp, ip_address): super().__init__(log.C_RUN, 'osmo-msc_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.config = None + self.encryption = None + self.authentication = None self.suite_run = suite_run self.ip_address = ip_address self.hlr = hlr diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/osmo_nitb.py index 48037a6..66ab2a6 100644 --- a/src/osmo_gsm_tester/osmo_nitb.py +++ b/src/osmo_gsm_tester/osmo_nitb.py @@ -24,17 +24,13 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc class OsmoNitb(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - bts = None - smsc = None - encryption = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-nitb_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.encryption = None self.suite_run = suite_run self.ip_address = ip_address self.bts = [] diff --git a/src/osmo_gsm_tester/osmo_sgsn.py b/src/osmo_gsm_tester/osmo_sgsn.py index 8659186..07cf059 100644 --- a/src/osmo_gsm_tester/osmo_sgsn.py +++ b/src/osmo_gsm_tester/osmo_sgsn.py @@ -23,16 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoSgsn(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - hlr = None - ggsn = None def __init__(self, suite_run, hlr, ggsn, ip_address): super().__init__(log.C_RUN, 'osmo-sgsn_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.hlr = hlr self.ggsn = ggsn diff --git a/src/osmo_gsm_tester/osmo_stp.py b/src/osmo_gsm_tester/osmo_stp.py index ced138b..5a7f0d3 100644 --- a/src/osmo_gsm_tester/osmo_stp.py +++ b/src/osmo_gsm_tester/osmo_stp.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, pcap_recorder class OsmoStp(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-stp_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address diff --git a/src/osmo_gsm_tester/osmocon.py b/src/osmo_gsm_tester/osmocon.py index 5b1e145..8b6040f 100644 --- a/src/osmo_gsm_tester/osmocon.py +++ b/src/osmo_gsm_tester/osmocon.py @@ -24,10 +24,6 @@ from .event_loop import MainLoop class Osmocon(log.Origin): - suite_run = None - run_dir = None - process = None - sk_tmp_dir = None FIRMWARE_FILE="opt/osmocom-bb/target/firmware/board/compal_e88/layer1.compalram.bin" @@ -37,6 +33,8 @@ raise log.Error('osmocon_phone contains no attr "serial_device"') self.serial_device = os.path.realpath(serial_device) super().__init__(log.C_RUN, 'osmocon_%s' % os.path.basename(self.serial_device)) + self.run_dir = None + self.process = None self.suite_run = suite_run self.conf = conf self.sk_tmp_dir = tempfile.mkdtemp('', 'ogtosmoconsk') diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py index 0260296..9ec8f35 100644 --- a/src/osmo_gsm_tester/pcu.py +++ b/src/osmo_gsm_tester/pcu.py @@ -22,9 +22,6 @@ class Pcu(log.Origin, metaclass=ABCMeta): """PCU Abstract Base Class.""" - suite_run = None - run_dir = None - bts = None ############## # PROTECTED diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py index 50ae134..ad8ebce 100644 --- a/src/osmo_gsm_tester/pcu_osmo.py +++ b/src/osmo_gsm_tester/pcu_osmo.py @@ -23,14 +23,14 @@ from . import log, config, util, template, process, pcu class OsmoPcu(pcu.Pcu): - inst = None - env = None BIN_PCU = 'osmo-pcu' PCU_OSMO_CFG = 'osmo-pcu.cfg' def __init__(self, suite_run, bts, conf): super().__init__(suite_run, bts, conf, OsmoPcu.BIN_PCU) + self.run_dir = None + self.inst = None self.conf = conf self.env = {} diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py index b97852a..cd3b75e 100644 --- a/src/osmo_gsm_tester/pcu_sysmo.py +++ b/src/osmo_gsm_tester/pcu_sysmo.py @@ -22,14 +22,6 @@ from . import log, config, util, template, process class OsmoPcuSysmo(log.Origin): - suite_run = None - bsc = None - run_dir = None - inst = None - remote_inst = None - remote_env = None - remote_dir = None - sysmobts = None REMOTE_DIR = '/osmo-gsm-tester-pcu' PCU_SYSMO_BIN = 'osmo-pcu' @@ -37,6 +29,12 @@ def __init__(self, suite_run, sysmobts, conf): super().__init__(log.C_RUN, self.PCU_SYSMO_BIN) + self.run_dir = None + self.bsc = None + self.inst = None + self.remote_inst = None + self.remote_dir = None + self.sysmobts = None self.suite_run = suite_run self.sysmobts = sysmobts self.conf = conf diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index c13ded0..ad2405d 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -29,13 +29,11 @@ class Process(log.Origin): - process_obj = None - outputs = None - result = None - killed = None - def __init__(self, name, run_dir, popen_args, **popen_kwargs): super().__init__(log.C_RUN, name) + self.process_obj = None + self.result = None + self.killed = None self.name_str = name self.run_dir = run_dir self.popen_args = popen_args diff --git a/src/osmo_gsm_tester/sms.py b/src/osmo_gsm_tester/sms.py index e264b66..0118517 100644 --- a/src/osmo_gsm_tester/sms.py +++ b/src/osmo_gsm_tester/sms.py @@ -19,7 +19,6 @@ class Sms: _last_sms_idx = 0 - msg = None def __init__(self, src_msisdn=None, dst_msisdn=None, *tokens): Sms._last_sms_idx += 1 diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/smsc.py index 4837f37..1a0859c 100644 --- a/src/osmo_gsm_tester/smsc.py +++ b/src/osmo_gsm_tester/smsc.py @@ -20,7 +20,6 @@ from . import log, config, util, template, process class Smsc: - esmes = None SMSC_POLICY_CLOSED = 'closed' SMSC_POLICY_ACCEPT_ALL = 'accept-all' diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index db4a8dc..c712a75 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -63,21 +63,17 @@ PASS = 'PASS' FAIL = 'FAIL' - trial = None - status = None - start_timestamp = None - duration = None - resources_pool = None - reserved_resources = None - objects_to_clean_up = None - test_import_modules_to_clean_up = [] - _resource_requirements = None - _config = None - _processes = None - _run_dir = None - def __init__(self, trial, suite_scenario_str, suite_definition, scenarios=[]): super().__init__(log.C_TST, suite_scenario_str) + self.start_timestamp = None + self.duration = None + self.reserved_resources = None + self.objects_to_clean_up = None + self.test_import_modules_to_clean_up = [] + self._resource_requirements = None + self._config = None + self._processes = None + self._run_dir = None self.trial = trial self.definition = suite_definition self.scenarios = scenarios diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py index b706dac..6f141f1 100644 --- a/src/osmo_gsm_tester/test.py +++ b/src/osmo_gsm_tester/test.py @@ -31,11 +31,10 @@ PASS = 'pass' FAIL = 'FAIL' - _run_dir = None - def __init__(self, suite_run, test_basename): self.basename = test_basename super().__init__(log.C_TST, self.basename) + self._run_dir = None self.suite_run = suite_run self.path = os.path.join(self.suite_run.definition.suite_dir, self.basename) self.status = Test.UNKNOWN diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/trial.py index d54e96c..149d34c 100644 --- a/src/osmo_gsm_tester/trial.py +++ b/src/osmo_gsm_tester/trial.py @@ -36,12 +36,6 @@ PASS = 'PASS' FAIL = 'FAIL' - path = None - dir = None - _run_dir = None - bin_tars = None - log_targets = None - @staticmethod def next(trials_dir): @@ -63,6 +57,8 @@ self.bin_tars = [] self.suites = [] self.status = Trial.UNKNOWN + self._run_dir = None + self.log_targets = None def __repr__(self): return self.name() -- To view, visit https://gerrit.osmocom.org/10413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5ad4cac34a9f49eaf42966c01c9c5a4d3f3e9dc8 Gerrit-Change-Number: 10413 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 13:55:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 9 Aug 2018 13:55:01 +0000 Subject: Change in osmo-gsm-tester[master]: bts_nanobts: Fix pwsup_list increasing its size every new test In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10411 ) Change subject: bts_nanobts: Fix pwsup_list increasing its size every new test ...................................................................... bts_nanobts: Fix pwsup_list increasing its size every new test variables under class section are shared among all instances, and are used unless the specific class instance attribute is set. As a result, the same pwsup_list object was being re-used. Take the chance to do the same with the _pcu var, since we want same behavior for it. See for reference: https://stackoverflow.com/a/1716730 Fixes: OS#3456 Change-Id: I3f6a9d64b35aec33430e90872f41c3d046653ce6 --- M src/osmo_gsm_tester/bts_nanobts.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index 7f0151f..a18f205 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -28,13 +28,13 @@ class NanoBts(bts.Bts): - pwsup_list = [] - _pcu = None ############## # PROTECTED ############## def __init__(self, suite_run, conf): super().__init__(suite_run, conf, 'nanobts_%s' % conf.get('label', 'nolabel'), 'nanobts') + self.pwsup_list = [] + self._pcu = None def _configure(self): if self.bsc is None: -- To view, visit https://gerrit.osmocom.org/10411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3f6a9d64b35aec33430e90872f41c3d046653ce6 Gerrit-Change-Number: 10411 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Aug 9 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 9 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#210?= Message-ID: <2107895015.134.1533827406258.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.08 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Aug 9 15:38:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 9 Aug 2018 15:38:07 +0000 Subject: Change in osmo-mgw[master]: add a VTY command which shows a specific mgcp endpoint In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10022 ) Change subject: add a VTY command which shows a specific mgcp endpoint ...................................................................... Patch Set 1: > Patch Set 1: > > ping? There was no response from Neels yet to my question. -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 09 Aug 2018 15:38:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 18:12:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 9 Aug 2018 18:12:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10414 Change subject: update DTX fill frame test expectations ...................................................................... update DTX fill frame test expectations Fix an off-by-one in frame number comparison: Ensure that we won't stop testing until after fn + 104 has been received. The DTX test case would never pass since the alt statement was always repeated even if enough frames had been received. Fix this by moving code which runs before frame fn + 104 is received into an 'else' cause. We receive SACCH frames in DTX mode so we must account for them. Introduce separate counters for SACCH and non-SACCH fill frames to make test failure diagnosis easier. Note that we cannot expect a specific amount of SACCH frames during a particular test run since their amount depends on what the current frame number window happens to be. We can however add the counters for SACCH and non-SACCH fill frames and obtain a meaningful result. Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Related: OS#1950 --- M bts/BTS_Tests.ttcn 1 file changed, 38 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/10414/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 890be91..923a8cc 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3832,7 +3832,9 @@ var octetstring l2_fill_frame_sacch := substr(l2_fill_frame, 0, lengthof(l2_fill_frame) - 2); var GsmFrameNumber first_fn; var boolean is_first_frame := true; - var integer nfill_frames := 0; + var integer nfill_frames_sacch := 0; + var integer nfill_frames_nonsacch := 0; + var integer expected_fill_frames := 10000; /* initial value causes test failure if not overridden */ const integer dtx_tchf_mod := 104; /* Frames numbers (mod 104) for which a fill frame is expected on TCHF if DTX is enabled. */ var Integers required_tdma_frames_dtx_tchf := { 52, 53, 54, 55, 56, 57, 58, 59 }; @@ -3872,32 +3874,47 @@ f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); setverdict(fail, "Received fill frame on non-TCH/F channel; DTX is only allowed on TCH/F!"); } - if (fn >= first_fn + dtx_tchf_mod) { + if (fn > first_fn + dtx_tchf_mod) { T.stop; f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - /* With DTX enabled we can expect at least 1 fill frame every 104 frames. */ - if (nfill_frames < 1) { - setverdict(fail); + + /* With DTX enabled we can expect at least 3 fill frames for every 104 frames. + * 2 SACCH, 1 TCH/F */ + expected_fill_frames := 3; + + if (nfill_frames_sacch + nfill_frames_nonsacch < expected_fill_frames) { + log("received only ", nfill_frames_sacch, "+", nfill_frames_nonsacch, + " (SACCH+other) out of ", expected_fill_frames, " expected fill frames"); + setverdict(fail, "Not enough fill frames received"); } else { setverdict(pass); } - } - for (var integer i := 0; i < lengthof(required_tdma_frames_dtx_tchf); i := i + 1) { - if (fn mod dtx_tchf_mod == required_tdma_frames_dtx_tchf[i]) { - nfill_frames := nfill_frames + 1; + } else { + if (dl.dl_info.link_id.c == SACCH) { + nfill_frames_sacch := nfill_frames_sacch + 1; repeat; } + /* On DTX TCH/F channels, fill frames occur only for specific frame numbers mod 104. */ + for (var integer i := 0; i < lengthof(required_tdma_frames_dtx_tchf); i := i + 1) { + if (fn mod dtx_tchf_mod == required_tdma_frames_dtx_tchf[i]) { + nfill_frames_nonsacch := nfill_frames_nonsacch + 1; + repeat; + } + } + log("Received DTX TCH fill frame with bad frame number: ", fn, + " (mod ", dtx_tchf_mod, ": ", fn mod dtx_tchf_mod, ")"); + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + setverdict(fail, "Unexpected L2 fill frame received on Um"); } - log("Received DTX TCH fill frame with bad frame number: ", fn, - " (mod ", dtx_tchf_mod, ": ", fn mod dtx_tchf_mod, ")"); - f_rsl_chan_deact(); - f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - setverdict(fail, "Unexpected L2 fill frame received on Um"); } else { - nfill_frames := nfill_frames + 1; - if (fn >= first_fn + dtx_tchf_mod) { - var integer expected_fill_frames; + if (dl.dl_info.link_id.c == SACCH) { + nfill_frames_sacch := nfill_frames_sacch + 1; + } else { + nfill_frames_nonsacch := nfill_frames_nonsacch + 1; + } + if (fn > first_fn + dtx_tchf_mod) { T.stop; if (f_g_chan_is_tchf()) { /* Without DTX we can expect 25 fill frames for every 104 frames. @@ -3917,9 +3934,12 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); - if (nfill_frames >= expected_fill_frames) { + + if (nfill_frames_sacch + nfill_frames_nonsacch >= expected_fill_frames) { setverdict(pass); } else { + log("received only ", nfill_frames_sacch, "+", nfill_frames_nonsacch, + " (SACCH+other) out of ", expected_fill_frames, " expected fill frames"); setverdict(fail, "Not enough fill frames received"); } } else { -- To view, visit https://gerrit.osmocom.org/10414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 18:15:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 9 Aug 2018 18:15:52 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10415 Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... send TCH/F fill frames in DTX mode (WIP) Send DTX TCH fill frames according to GSM 05.08, section 8.3. Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Related: OS#1950 --- M src/common/l1sap.c 1 file changed, 52 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/10415/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 8d735e5..ed818cb 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -670,6 +670,19 @@ return 0; } + /* Determine whether we need to send a DTX TCH fill frame according to GSM 05.08, section 8.3. */ +static bool is_required_tchf_fill_frame_dtx(uint32_t fn) { + /* On TCHF this subset of TDMA frames (mod 104) is always used for transmission during DTX: */ + const int tchf_required_fn_dtx[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; + int i; + + for (i = 0; i < ARRAY_SIZE(tchf_required_fn_dtx); i++) { + if (fn % 104 == tchf_required_fn_dtx[i]) + return true; + } + return false; +} + /* PH-RTS-IND prim received from bts model */ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *rts_ind) @@ -729,14 +742,18 @@ si = bts_sysinfo_get(trx->bts, &g_time); if (si) memcpy(p, si, GSM_MACBLOCK_LEN); - else + else { memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame BCCH chan_nr=%d fn=%u\n", chan_nr, fn); + } } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ + bool dtxd = false; lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); return 0; } + dtxd = lchan->ts->trx->bts->dtxd; if (L1SAP_IS_LINK_SACCH(link_id)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ @@ -756,20 +773,39 @@ if (si) { /* The +2 is empty space where the DSP inserts the L1 hdr */ memcpy(p + 2, si, GSM_MACBLOCK_LEN - 2); - } else + } else { memcpy(p + 2, fill_frame, GSM_MACBLOCK_LEN - 2); - } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr) || - (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN && !lchan->ts->trx->bts->dtxd)) { - /* - * SDCCH or TCH in signalling mode without DTX. - * - * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the - * half rate speech traffic channel in signalling only mode DTX is not allowed. - * In these cases and during signalling on the TCH when DTX is not used, the same - * L2 fill frame shall be transmitted in case there is nothing else to transmit." - */ + DEBUGPGT(DL1P, &g_time, "sending fill frame SACCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + } + } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame SDCCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + } else if (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN) { + if (lchan->ts->trx->bts->dtxd) { + /* + * TCH in signalling mode with DTX. + * Send fill frame according to GSM 05.08, section 8.3. + */ + if (L1SAP_IS_CHAN_TCHF(chan_nr) && is_required_tchf_fill_frame_dtx(fn)) { + p = msgb_put(msg, GSM_MACBLOCK_LEN); + memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + //dtx_dispatch(lchan, E_FACCH); + } + } else { + /* + * TCH in signalling mode without DTX. + * + * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the + * half rate speech traffic channel in signalling only mode DTX is not allowed. + * In these cases and during signalling on the TCH when DTX is not used, the same + * L2 fill frame shall be transmitted in case there is nothing else to transmit." + */ + p = msgb_put(msg, GSM_MACBLOCK_LEN); + memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + } } /* else the message remains empty, so TCH frames are sent */ } else { /* The +2 is empty space where the DSP inserts the L1 hdr */ @@ -790,8 +826,10 @@ rc = bts_ccch_copy_msg(trx->bts, p, &g_time, (L1SAP_FN2CCCHBLOCK(fn) < num_agch(trx, "PH-RTS-IND"))); - if (rc <= 0) + if (rc <= 0) { memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame AGCH PCH chan_nr=%d fn=%u\n", chan_nr, fn); + } } DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id); @@ -1440,6 +1478,7 @@ char name[32]; snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr); + LOGP(DL1C, LOGL_NOTICE, "allocating DTX FSM for chan_nr=%d\n", chan_nr); lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm, tall_bts_ctx, lchan, -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 18:20:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 9 Aug 2018 18:20:57 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10415 ) Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... Patch Set 1: This is WIP because the TTCN3 test TC_tch_sign_l2_fill_frame_dtxd is still failing with this diff. I don't understand the reason for the failure. The problem is that the TCH/F fill frame is received by the TTCN3 test in a frame number which is not in the set of required frame numbers % 104. Hence the test fails with verdict "Unexpected L2 fill frame received on Um". However, debug log which is written by this patch shows that the frame number used in my osmo-bts patch falls into the set of required frame numbers % 104. Does anyone have an idea where this problem could be coming from? Am I wrong in assuming that the frame number used in osmo-bts's l1sap_ph_rts_ind() should match the frame number received in TTCN3? -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 09 Aug 2018 18:20:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 9 18:28:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 9 Aug 2018 18:28:24 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10415 ) Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... Patch Set 1: Specifically, this is what I am seeing: osmo-bts: l1sap.c:793 000260/00/00/05/04 sending fill frame TCH chan_nr=9 fn=260 dtx=enabled ttcn3 test: Received DTX TCH fill frame with bad frame number: 268 (mod 104: 60) -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 09 Aug 2018 18:28:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 00:10:11 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 10 Aug 2018 00:10:11 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... Patch Set 5: > review comment to patch 2 still pending what's missing exactly? -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 10 Aug 2018 00:10:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 00:10:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 10 Aug 2018 00:10:36 +0000 Subject: Change in osmo-ci[master]: obs-nightly: introduce osmo-trx-debian8-jessie In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10277 ) Change subject: obs-nightly: introduce osmo-trx-debian8-jessie ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/10277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8477b580976b376ee5abdde98a651d47199ef6d9 Gerrit-Change-Number: 10277 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 10 Aug 2018 00:10:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 00:43:58 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 10 Aug 2018 00:43:58 +0000 Subject: Change in osmo-ci[master]: obs-nightly: introduce osmo-trx-debian8-jessie In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/10277 ) Change subject: obs-nightly: introduce osmo-trx-debian8-jessie ...................................................................... obs-nightly: introduce osmo-trx-debian8-jessie A compatible package for debian8 as it does not support limesdr. This patch depend on: I261302d2ed16e76540073589504e7426e23d00a1 Change-Id: I8477b580976b376ee5abdde98a651d47199ef6d9 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved lynxis lazus: Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index f2bf9b1..88b6812 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -134,6 +134,16 @@ git checkout "$TAG" } +create_osmo_trx_debian8_jessie() { + # The package must be already checked out via `checkout osmo-trx` + cd "$REPO" + cp -a osmo-trx osmo-trx-debian8-jessie + cd osmo-trx-debian8-jessie/ + patch -p1 < debian/patches/build-for-debian8.patch + git commit -m 'auto-commit: allow debian8 to build' debian/ + cd .. +} + build_osmocom() { BASE=$PWD DATA=$BASE/data @@ -173,6 +183,8 @@ checkout rtl-sdr checkout osmo-fl2k + create_osmo_trx_debian8_jessie + build limesuite no_commit --git-upstream-tree=01e2d00c5005b85d1f94cca02881756a72e35e2a build libosmocore build libosmo-sccp @@ -188,6 +200,7 @@ build openbsc build osmo-pcap build osmo-trx + build osmo-trx-debian8-jessie build osmo-sip-connector build osmo-bts build osmo-pcu -- To view, visit https://gerrit.osmocom.org/10277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8477b580976b376ee5abdde98a651d47199ef6d9 Gerrit-Change-Number: 10277 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 06:55:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 06:55:47 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#6) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... bssgp: introduce flush queue functions To reset the state of BSSGP allow to flush the BSSGP queues. When testing (with TTCN3) the test object should be resetted between each test. Introduce the functions: bssgp_fc_flush_queue() - flushs a single flow control object bssgp_flush_all_queues() - flushs queues of all BSSGP connections Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/libosmogb.map 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/10371/6 -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 06:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 06:56:11 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... Patch Set 6: > > review comment to patch 2 still pending > > what's missing exactly? As I wrote in my comment: It's BSSGP contexts, not connections. I edited the patch now. -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 10 Aug 2018 06:56:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 06:56:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 06:56:26 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Makefile: enable host USB access In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10412 ) Change subject: gr-gsm-master/Makefile: enable host USB access ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8170d2c31b4e28f6a406c50b10b7626f70f36d28 Gerrit-Change-Number: 10412 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 10 Aug 2018 06:56:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 06:56:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 06:56:27 +0000 Subject: Change in docker-playground[master]: gr-gsm-master/Makefile: enable host USB access In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10412 ) Change subject: gr-gsm-master/Makefile: enable host USB access ...................................................................... gr-gsm-master/Makefile: enable host USB access Privileged USB access is required for direct communication between the image's UHD driver and a host's USRP device. Change-Id: I8170d2c31b4e28f6a406c50b10b7626f70f36d28 --- M gr-gsm-master/Makefile 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/gr-gsm-master/Makefile b/gr-gsm-master/Makefile index 8d0e10b..b030a43 100644 --- a/gr-gsm-master/Makefile +++ b/gr-gsm-master/Makefile @@ -1 +1,5 @@ +RUN_ARGS?= \ + --privileged \ + -v /dev/bus/usb:/dev/bus/usb + include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/10412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8170d2c31b4e28f6a406c50b10b7626f70f36d28 Gerrit-Change-Number: 10412 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 06:56:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 06:56:39 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 10 Aug 2018 06:56:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 06:59:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 06:59:34 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10415 ) Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... Patch Set 1: are you sure that unexpected frame was received on the TCH/F you ar=e monitoring and not on some completely other logical channel? The 0303012b2b2b... frames are sent in many places on all kinds of logical channels whenever there's nothing else to send, such as downlink AGCH, unused frames in SDCCH, ... -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 10 Aug 2018 06:59:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 07:00:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 07:00:17 +0000 Subject: Change in libosmocore[master]: bssgp: introduce flush queue functions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10371 ) Change subject: bssgp: introduce flush queue functions ...................................................................... bssgp: introduce flush queue functions To reset the state of BSSGP allow to flush the BSSGP queues. When testing (with TTCN3) the test object should be resetted between each test. Introduce the functions: bssgp_fc_flush_queue() - flushs a single flow control object bssgp_flush_all_queues() - flushs queues of all BSSGP connections Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/gprs_bssgp.c M src/gb/libosmogb.map 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h index 2dead69..400c3e0 100644 --- a/include/osmocom/gprs/gprs_bssgp.h +++ b/include/osmocom/gprs/gprs_bssgp.h @@ -207,6 +207,9 @@ int bssgp_fc_ms_init(struct bssgp_flow_control *fc_ms, uint16_t bvci, uint16_t nsei, uint32_t max_queue_depth); +void bssgp_flush_all_queues(); +void bssgp_fc_flush_queue(struct bssgp_flow_control *fc); + /* gprs_bssgp_vty.c */ int bssgp_vty_init(void); void bssgp_set_log_ss(int ss); diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 5dfce16..3b9fbf9 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -1263,3 +1263,31 @@ { DBSSGP = ss; } + +/*! + * \brief Flush the queue of the bssgp_flow_control + * \param[in] The flow control object which holds the queue. + */ +void bssgp_fc_flush_queue(struct bssgp_flow_control *fc) +{ + struct bssgp_fc_queue_element *element, *tmp; + + llist_for_each_entry_safe(element, tmp, &fc->queue, list) { + msgb_free(element->msg); + llist_del(&element->list); + talloc_free(element); + } +} + +/*! + * \brief Flush the queues of all BSSGP contexts. + */ +void bssgp_flush_all_queues() +{ + struct bssgp_bvc_ctx *bctx; + + llist_for_each_entry(bctx, &bssgp_bvc_ctxts, list) { + if (bctx->fc) + bssgp_fc_flush_queue(bctx->fc); + } +} diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index d56e651..ec69670 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -6,6 +6,8 @@ bssgp_fc_in; bssgp_fc_init; bssgp_fc_ms_init; +bssgp_fc_flush_queue; +bssgp_flush_all_queues; bssgp_msgb_alloc; bssgp_msgb_copy; bssgp_msgb_tlli_put; -- To view, visit https://gerrit.osmocom.org/10371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Gerrit-Change-Number: 10371 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 07:09:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 07:09:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10414 ) Change subject: update DTX fill frame test expectations ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn at 3840 PS1, Line 3840: 52, 53, 54, 55, 56, 57, 58, 5 this is listing all eitght bursts that are required during DTX on a TCH/F. However, the test operates at block level, so the two blocks received s hould be 52 + 56 (IIRC we report the frame number of the first burst of each block). -- To view, visit https://gerrit.osmocom.org/10414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 10 Aug 2018 07:09:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 07:19:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 07:19:38 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10415 ) Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10415/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/#/c/10415/1/src/common/l1sap.c at 676 PS1, Line 676: 52, 53, 54, 55, 56, 57, 58, 59 again also here: We are opearating at _block_ level at the l1sap level, not a burst level. So we will ever only see a RTS.ind for 52 and 56 here, and the PHY will transmit at fn%26 == (52.53,54,55 and 56,57,58,59 respectively). So if you want to be super careful, I would check if it's 52 or 56, and could OSMO_ASSERT if it's ever any of the other numbers above, which should never happen, as TCH/F blocks are defined to start at 0,4,8,13,17,21 (modulo 26), which means 0,4,8,13,17,21, 26,30,34,38,47, 52,56,60,65,73, 78,82,86,91,99 -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 10 Aug 2018 07:19:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 07:20:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 07:20:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Wait for immedate assignment in f_chreq_act_ack In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10407 ) Change subject: bsc: Wait for immedate assignment in f_chreq_act_ack ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2831d4caf7f045b3396d28a978328e8a1097d8d3 Gerrit-Change-Number: 10407 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 10 Aug 2018 07:20:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 07:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 07:20:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Wait for immedate assignment in f_chreq_act_ack In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10407 ) Change subject: bsc: Wait for immedate assignment in f_chreq_act_ack ...................................................................... bsc: Wait for immedate assignment in f_chreq_act_ack Sometimes TC_chan_rel_hard_rlsd_ms_dead could fail because the Immediate assignment command would arrive in the RSL queue after it was cleared in f_expect_chan_rel. The alt statement would now never complete since the Immediate Assignment was blocking/hogging the queue. Wait explicitly for the IMM ASS in f_chreq_act_ack before continuing. Change-Id: I2831d4caf7f045b3396d28a978328e8a1097d8d3 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 5af4573..e94b781 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -642,6 +642,7 @@ rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); var RslChannelNr chan_nr := rx_rsl.ies[0].body.chan_nr; f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); + rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); return chan_nr; } -- To view, visit https://gerrit.osmocom.org/10407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2831d4caf7f045b3396d28a978328e8a1097d8d3 Gerrit-Change-Number: 10407 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 07:21:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 07:21:47 +0000 Subject: Change in docker-playground[master]: regen_docs: Add a script that extracts counter and vty info In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10273 ) Change subject: regen_docs: Add a script that extracts counter and vty info ...................................................................... Patch Set 1: Code-Review+2 We can merge this, but I seriously fear that having another set of config files will make this break frequently. We already have the example config, the config templates in osmo-gsm-tester, the existing configs in docker-playground for the TTCN3 tests, etc. to update / sync in case of changes as it is... -- To view, visit https://gerrit.osmocom.org/10273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e57a64caccfbc982199f8f25bbb14c2d96e11a6 Gerrit-Change-Number: 10273 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 10 Aug 2018 07:21:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:36 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10416 Change subject: apps/grgsm_trx: also print Piotr as a copyright holder ...................................................................... apps/grgsm_trx: also print Piotr as a copyright holder Despite the most part of Python code was written by Vadim, it's heavily based on huge and impressive work done by Piotr. Let's also print his credentials in the license header. Change-Id: Icca7c679d84f99440ff502219f624e0f73112744 --- M apps/grgsm_trx 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/16/10416/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 128adab..eafc726 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -31,6 +31,7 @@ COPYRIGHT = \ "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \ + "Copyright (C) 2017 by Piotr Krysik \n" \ "License GPLv2+: GNU GPL version 2 or later " \ "\n" \ "This is free software: you are free to change and redistribute it.\n" \ -- To view, visit https://gerrit.osmocom.org/10416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744 Gerrit-Change-Number: 10416 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:37 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700 Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10417 Change subject: grgsm_trx: change default TRX port number to 6700 ...................................................................... grgsm_trx: change default TRX port number to 6700 In order to avoid clashes with OsmoTRX, which may be also running on the same host, let's use a different port range starting from 6700 by default. This idea was introduced as a result of OS#2984. Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4 --- M apps/grgsm_trx 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/17/10417/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index eafc726..eb7fbdb 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -40,7 +40,7 @@ class Application: # Application variables remote_addr = "127.0.0.1" - base_port = 5700 + base_port = 6700 # PHY specific phy_sample_rate = 4 * 1625000 / 6 -- To view, visit https://gerrit.osmocom.org/10417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4 Gerrit-Change-Number: 10417 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:41 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10418 Change subject: trx/radio_if.py: reset UHD device time at startup ...................................................................... trx/radio_if.py: reset UHD device time at startup Some UHD devices, such as UmTRX, require one to manually reset the hardware clock, otherwise the burst transmission doesn't work. Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 --- M python/trx/radio_if.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/18/10418/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 355312b..83bfffe 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -257,6 +257,12 @@ (self.dict_toggle_sign, 'dict_out'), (self.msg_to_tag_sink, 'msg')) + + # Some UHD devices, such as UmTRX, require one + # to manually reset the hardware clock + self.phy_src.set_time_now(uhd.time_spec(0.0)) + self.phy_sink.set_time_now(uhd.time_spec(0.0)) + def shutdown(self): print("[i] Shutdown Radio interface") self.stop() -- To view, visit https://gerrit.osmocom.org/10418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 Gerrit-Change-Number: 10418 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:41 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10419 Change subject: trx/radio_if.py: drop useless import of osmosdr ...................................................................... trx/radio_if.py: drop useless import of osmosdr Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 --- M python/trx/radio_if.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/19/10419/1 diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 83bfffe..21276e5 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -26,7 +26,6 @@ import pmt import time import grgsm -import osmosdr from math import pi -- To view, visit https://gerrit.osmocom.org/10419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 Gerrit-Change-Number: 10419 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:42 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10420 Change subject: apps/grgsm_trx: use format string for help message ...................................................................... apps/grgsm_trx: use format string for help message Instead of using the hard-coded default values in help message, it makes sense to use a format string, and pass the actual values when printing help. Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d --- M apps/grgsm_trx 1 file changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/20/10420/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index eb7fbdb..b925fc1 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -96,20 +96,27 @@ # TRX specific s += " TRX interface specific\n" \ - " -i --remote-addr Set remote address (default 127.0.0.1)\n" \ - " -p --base-port Set base port number (default 5700)\n\n" + " -i --remote-addr Set remote address (default %s)\n" \ + " -p --base-port Set base port number (default %d)\n\n" # PHY specific s += " Radio interface specific\n" \ " -a --device-args Set device arguments\n" \ " -s --sample-rate Set sample rate\n" \ - " -g --rx-gain Set RX gain (default 30)\n" \ - " -G --tx-gain Set TX gain (default 10)\n" \ - " --rx-antenna Set RX antenna (default RX2)\n" \ - " --tx-antenna Set TX antenna (default TX/RX)\n" \ - " --ppm Set frequency correction (default 0)\n" + " -g --rx-gain Set RX gain (default %d)\n" \ + " -G --tx-gain Set TX gain (default %d)\n" \ + " --rx-antenna Set RX antenna (default %s)\n" \ + " --tx-antenna Set TX antenna (default %s)\n" \ + " --ppm Set frequency correction (default %d)\n" - print(s) + print(s % ( + self.remote_addr, + self.base_port, + self.phy_rx_gain, + self.phy_tx_gain, + self.phy_rx_antenna, + self.phy_tx_antenna, + self.phy_ppm)) def parse_argv(self): try: -- To view, visit https://gerrit.osmocom.org/10420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d Gerrit-Change-Number: 10420 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:43 +0000 Subject: Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10421 Change subject: trx/udp_link.py: close socket in destructor ...................................................................... trx/udp_link.py: close socket in destructor Previously it was required to call the UDPLink.shutdown() method manually in order to close a socket. Let's do it automatically using the destructor of UDPLink. Cherry-picked from: I59c3dc61ec58cd9effeb789947d28fd602ca91f4 Change-Id: Ief7aa21d1e50682a90616833b679741957193aae --- M apps/grgsm_trx M python/trx/ctrl_if_bb.py M python/trx/udp_link.py 3 files changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/21/10421/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index b925fc1..668b0be 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -83,7 +83,6 @@ def shutdown(self): print("[i] Shutting down...") - self.server.shutdown() self.radio.shutdown() def print_copyright(self): diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index 5874e59..7886e23 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -35,10 +35,6 @@ # Power measurement self.pm = pm - def shutdown(self): - print("[i] Shutdown CTRL interface") - ctrl_if.shutdown(self) - def parse_cmd(self, request): # Power control if self.verify_cmd(request, "POWERON", 0): diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index 675ef5c..cedcb1b 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -35,6 +35,9 @@ self.remote_addr = remote_addr self.remote_port = remote_port + def __del__(self): + self.sock.close() + def loop(self): r_event, w_event, x_event = select.select([self.sock], [], []) @@ -43,9 +46,6 @@ data, addr = self.sock.recvfrom(128) self.handle_rx(data.decode()) - def shutdown(self): - self.sock.close(); - def send(self, data): if type(data) not in [bytearray, bytes]: data = data.encode() -- To view, visit https://gerrit.osmocom.org/10421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae Gerrit-Change-Number: 10421 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:44 +0000 Subject: Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10422 Change subject: trx/udp_link.py: set SO_REUSEADDR socket option ...................................................................... trx/udp_link.py: set SO_REUSEADDR socket option Setting this option allows one to reuse existing connections, for example, by injecting CTRL commands or DATA bursts into existing connections. Cherry-picked from: I0882c76affa9a668a12d10967081054d2b666ed1 Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 --- M python/trx/udp_link.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/22/10422/1 diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index cedcb1b..1fae8b4 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -28,6 +28,7 @@ class udp_link: def __init__(self, remote_addr, remote_port, bind_port): self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self.sock.bind((remote_addr, bind_port)) self.sock.setblocking(0) -- To view, visit https://gerrit.osmocom.org/10422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 Gerrit-Change-Number: 10422 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:45 +0000 Subject: Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10423 Change subject: trx/ctrl_if.py: send control responses to where commands are from ...................................................................... trx/ctrl_if.py: send control responses to where commands are from When we receive a control command, we should not simply send the response to the default destination, but send it back to the exact IP/prt from which the command originated. This ensures correct routing of responses even in case multiple programs are interfacing concurrently with a control socket. Cherry-picked from: I24a0bba6eed059b101af95dac7d059f34dd715fc Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196 --- M python/trx/ctrl_if.py M python/trx/udp_link.py 2 files changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/23/10423/1 diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py index 7dee0f8..ae5cf05 100644 --- a/python/trx/ctrl_if.py +++ b/python/trx/ctrl_if.py @@ -25,15 +25,15 @@ from grgsm.trx import udp_link class ctrl_if(udp_link): - def handle_rx(self, data): + def handle_rx(self, data, remote): if self.verify_req(data): request = self.prepare_req(data) rc = self.parse_cmd(request) if type(rc) is tuple: - self.send_response(request, rc[0], rc[1]) + self.send_response(request, remote, rc[0], rc[1]) else: - self.send_response(request, rc) + self.send_response(request, remote, rc) else: print("[!] Wrong data on CTRL interface") @@ -65,7 +65,7 @@ return True - def send_response(self, request, response_code, params = None): + def send_response(self, request, remote, response_code, params = None): # Include status code, for example ["TXTUNE", "0", "941600"] request.insert(1, str(response_code)) @@ -76,7 +76,7 @@ # Add the response signature, and join back to string response = "RSP " + " ".join(request) + "\0" # Now we have something like "RSP TXTUNE 0 941600" - self.send(response) + self.send(response, remote) def parse_cmd(self, request): raise NotImplementedError diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index 1fae8b4..d96a6aa 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -45,13 +45,16 @@ # Check for incoming data if self.sock in r_event: data, addr = self.sock.recvfrom(128) - self.handle_rx(data.decode()) + self.handle_rx(data.decode(), addr) - def send(self, data): + def send(self, data, remote = None): if type(data) not in [bytearray, bytes]: data = data.encode() - self.sock.sendto(data, (self.remote_addr, self.remote_port)) + if remote is None: + remote = (self.remote_addr, self.remote_port) - def handle_rx(self, data): + self.sock.sendto(data, remote) + + def handle_rx(self, data, remote): raise NotImplementedError -- To view, visit https://gerrit.osmocom.org/10423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196 Gerrit-Change-Number: 10423 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:45 +0000 Subject: Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10424 Change subject: gsm_trx_burst_if: allow to customize the bind address ...................................................................... gsm_trx_burst_if: allow to customize the bind address Pleviously remote address for DATA interface was also used as the bind address, what is definitely wrong. Let's change the API a bit in order to allow one to specify a custom bind address. Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6 --- M grc/trx/gsm_trx_burst_if.xml M include/grgsm/misc_utils/udp_socket.h M include/grgsm/trx/trx_burst_if.h M lib/misc_utils/udp_socket.cc M lib/trx/trx_burst_if_impl.cc M lib/trx/trx_burst_if_impl.h M python/trx/radio_if.py 7 files changed, 26 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/24/10424/1 diff --git a/grc/trx/gsm_trx_burst_if.xml b/grc/trx/gsm_trx_burst_if.xml index 99427b3..49979a3 100644 --- a/grc/trx/gsm_trx_burst_if.xml +++ b/grc/trx/gsm_trx_burst_if.xml @@ -3,7 +3,7 @@ TRX Burst Interface gsm_trx_burst_if import grgsm - grgsm.trx_burst_if($remote_addr, $base_port) + grgsm.trx_burst_if($bind_addr, $remote_addr, $base_port) base_port @@ -13,6 +13,13 @@ + bind_addr + bind_addr + 0.0.0.0 + string + + + remote_addr remote_addr 127.0.0.1 diff --git a/include/grgsm/misc_utils/udp_socket.h b/include/grgsm/misc_utils/udp_socket.h index 15b2c66..d1ceb9f 100644 --- a/include/grgsm/misc_utils/udp_socket.h +++ b/include/grgsm/misc_utils/udp_socket.h @@ -53,8 +53,9 @@ public: udp_socket( - const std::string &remote_addr, + const std::string &bind_addr, const std::string &src_port, + const std::string &remote_addr, const std::string &dst_port, size_t mtu); ~udp_socket(); diff --git a/include/grgsm/trx/trx_burst_if.h b/include/grgsm/trx/trx_burst_if.h index 0e7a35a..9277dc5 100644 --- a/include/grgsm/trx/trx_burst_if.h +++ b/include/grgsm/trx/trx_burst_if.h @@ -48,6 +48,7 @@ * creating new instances. */ static sptr make( + const std::string &bind_addr, const std::string &remote_addr, const std::string &base_port); }; diff --git a/lib/misc_utils/udp_socket.cc b/lib/misc_utils/udp_socket.cc index 73393a0..c43f183 100644 --- a/lib/misc_utils/udp_socket.cc +++ b/lib/misc_utils/udp_socket.cc @@ -38,8 +38,9 @@ namespace gsm { udp_socket::udp_socket( - const std::string &remote_addr, + const std::string &bind_addr, const std::string &src_port, + const std::string &remote_addr, const std::string &dst_port, size_t mtu) { @@ -50,7 +51,7 @@ udp::resolver resolver(d_io_service); udp::resolver::query rx_query( - udp::v4(), remote_addr, src_port, + udp::v4(), bind_addr, src_port, boost::asio::ip::resolver_query_base::passive); udp::resolver::query tx_query( udp::v4(), remote_addr, dst_port, diff --git a/lib/trx/trx_burst_if_impl.cc b/lib/trx/trx_burst_if_impl.cc index e3fcc89..f72eecd 100644 --- a/lib/trx/trx_burst_if_impl.cc +++ b/lib/trx/trx_burst_if_impl.cc @@ -48,19 +48,22 @@ trx_burst_if::sptr trx_burst_if::make( + const std::string &bind_addr, const std::string &remote_addr, const std::string &base_port) { int base_port_int = boost::lexical_cast (base_port); return gnuradio::get_initial_sptr - (new trx_burst_if_impl(remote_addr, base_port_int)); + (new trx_burst_if_impl(bind_addr, remote_addr, + base_port_int)); } /* * The private constructor */ trx_burst_if_impl::trx_burst_if_impl( + const std::string &bind_addr, const std::string &remote_addr, int base_port ) : gr::block("trx_burst_if", @@ -79,8 +82,8 @@ std::string data_dst_port = boost::lexical_cast (base_port + 102); // Init DATA interface - d_data_sock = new udp_socket(remote_addr, - data_src_port, data_dst_port, DATA_IF_MTU); + d_data_sock = new udp_socket(bind_addr, data_src_port, + remote_addr, data_dst_port, DATA_IF_MTU); // Bind DATA interface handler d_data_sock->udp_rx_handler = boost::bind( diff --git a/lib/trx/trx_burst_if_impl.h b/lib/trx/trx_burst_if_impl.h index 27ec259..fdb49f2 100644 --- a/lib/trx/trx_burst_if_impl.h +++ b/lib/trx/trx_burst_if_impl.h @@ -40,7 +40,8 @@ void burst_pack(pmt::pmt_t msg, uint8_t *buf); public: - trx_burst_if_impl(const std::string &remote_addr, int base_port); + trx_burst_if_impl(const std::string &bind_addr, + const std::string &remote_addr, int base_port); ~trx_burst_if_impl(); void handle_dl_burst(pmt::pmt_t msg); diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 21276e5..8553eba 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -81,7 +81,8 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - trx_remote_addr, trx_base_port): + trx_remote_addr, trx_base_port, + trx_bind_addr = "0.0.0.0"): print("[i] Init Radio interface") @@ -95,8 +96,8 @@ # TRX Burst Interface self.trx_burst_if = grgsm.trx_burst_if( - trx_remote_addr, str(trx_base_port)) - + trx_bind_addr, trx_remote_addr, + str(trx_base_port)) # RX path definition self.phy_src = uhd.usrp_source(phy_args, -- To view, visit https://gerrit.osmocom.org/10424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6 Gerrit-Change-Number: 10424 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:46 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10425 Change subject: apps/grgsm_trx: introduce bind address option ...................................................................... apps/grgsm_trx: introduce bind address option The new option (-b --bind-addr) allows one to specify the bind address for both DATA and CTRL interfaces. By default, '0.0.0.0' is used, so there are no restrictions for the L1 source address. Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9 --- M apps/grgsm_trx M python/trx/ctrl_if_bb.py M python/trx/radio_if.py M python/trx/udp_link.py 4 files changed, 23 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/25/10425/1 diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 668b0be..1c0581f 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -3,7 +3,7 @@ # GR-GSM based transceiver # -# (C) 2016-2017 by Vadim Yanitskiy +# (C) 2016-2018 by Vadim Yanitskiy # # All Rights Reserved # @@ -30,7 +30,7 @@ from grgsm.trx import fake_pm COPYRIGHT = \ - "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \ + "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ "Copyright (C) 2017 by Piotr Krysik \n" \ "License GPLv2+: GNU GPL version 2 or later " \ "\n" \ @@ -40,6 +40,7 @@ class Application: # Application variables remote_addr = "127.0.0.1" + bind_addr = "0.0.0.0" base_port = 6700 # PHY specific @@ -63,7 +64,8 @@ self.radio = radio_if(self.phy_args, self.phy_sample_rate, self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm, self.phy_rx_antenna, self.phy_tx_antenna, - self.remote_addr, self.base_port) + self.bind_addr, self.remote_addr, + self.base_port) # Power measurement emulation # Noise: -120 .. -105 @@ -71,8 +73,9 @@ self.pm = fake_pm(-120, -105, -75, -50) # Init TRX CTRL interface - self.server = ctrl_if_bb(self.remote_addr, - self.base_port + 101, self.base_port + 1, + self.server = ctrl_if_bb( + self.remote_addr, self.base_port + 101, + self.bind_addr, self.base_port + 1, self.radio, self.pm) print("[i] Init complete") @@ -96,6 +99,7 @@ # TRX specific s += " TRX interface specific\n" \ " -i --remote-addr Set remote address (default %s)\n" \ + " -b --bind-addr Set bind address (default %s)\n" \ " -p --base-port Set base port number (default %d)\n\n" # PHY specific @@ -110,6 +114,7 @@ print(s % ( self.remote_addr, + self.bind_addr, self.base_port, self.phy_rx_gain, self.phy_tx_gain, @@ -120,10 +125,10 @@ def parse_argv(self): try: opts, args = getopt.getopt(sys.argv[1:], - "i:p:a:s:g:G:h", - ["help", "remote-addr=", "base-port=", "device-args=", - "sample-rate=", "rx-gain=", "tx-gain=", "ppm=", - "rx-antenna=", "tx-antenna="]) + "i:b:p:a:s:g:G:h", + ["help", "remote-addr=", "bind-addr=", "base-port=", + "device-args=", "sample-rate=", "rx-gain=", "tx-gain=", + "ppm=", "rx-antenna=", "tx-antenna="]) except getopt.GetoptError as err: # Print(help and exit) self.print_help() @@ -138,6 +143,8 @@ # TRX specific elif o in ("-i", "--remote-addr"): self.remote_addr = v + elif o in ("-b", "--bind-addr"): + self.bind_addr = v elif o in ("-p", "--base-port"): if int(v) >= 0 and int(v) <= 65535: self.base_port = int(v) diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index 7886e23..f5a9fa3 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -26,9 +26,10 @@ from ctrl_if import ctrl_if class ctrl_if_bb(ctrl_if): - def __init__(self, remote_addr, remote_port, bind_port, tb, pm): + def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm): print("[i] Init CTRL interface") - ctrl_if.__init__(self, remote_addr, remote_port, bind_port) + ctrl_if.__init__(self, remote_addr, remote_port, + bind_addr, bind_port) # Set link to the follow graph (top block) self.tb = tb diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 8553eba..b6d1961 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -81,8 +81,8 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - trx_remote_addr, trx_base_port, - trx_bind_addr = "0.0.0.0"): + trx_bind_addr, trx_remote_addr, + trx_base_port): print("[i] Init Radio interface") diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index d96a6aa..efa701b 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -26,10 +26,10 @@ import select class udp_link: - def __init__(self, remote_addr, remote_port, bind_port): + def __init__(self, remote_addr, remote_port, bind_addr = '0.0.0.0', bind_port = 0): self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.sock.bind((remote_addr, bind_port)) + self.sock.bind((bind_addr, bind_port)) self.sock.setblocking(0) # Save remote info -- To view, visit https://gerrit.osmocom.org/10425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9 Gerrit-Change-Number: 10425 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 08:20:47 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 08:20:47 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10426 Change subject: apps/grgsm_trx: print bind / remote address and port ...................................................................... apps/grgsm_trx: print bind / remote address and port Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87 --- M python/trx/ctrl_if_bb.py M python/trx/radio_if.py M python/trx/udp_link.py 3 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/26/10426/1 diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index f5a9fa3..fe0002e 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -27,10 +27,11 @@ class ctrl_if_bb(ctrl_if): def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm): - print("[i] Init CTRL interface") ctrl_if.__init__(self, remote_addr, remote_port, bind_addr, bind_port) + print("[i] Init CTRL interface (%s)" % self.desc_link()) + # Set link to the follow graph (top block) self.tb = tb # Power measurement diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index b6d1961..6374be7 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -84,7 +84,9 @@ trx_bind_addr, trx_remote_addr, trx_base_port): - print("[i] Init Radio interface") + print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)" + % (trx_bind_addr, trx_base_port + 2, + trx_remote_addr, trx_base_port + 102)) # PHY specific variables self.sample_rate = phy_sample_rate diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index efa701b..ad84e5a 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -47,6 +47,12 @@ data, addr = self.sock.recvfrom(128) self.handle_rx(data.decode(), addr) + def desc_link(self): + (bind_addr, bind_port) = self.sock.getsockname() + + return "L:%s:%u <-> R:%s:%u" \ + % (bind_addr, bind_port, self.remote_addr, self.remote_port) + def send(self, data, remote = None): if type(data) not in [bytearray, bytes]: data = data.encode() -- To view, visit https://gerrit.osmocom.org/10426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87 Gerrit-Change-Number: 10426 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:27:17 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:27:17 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10418 ) Change subject: trx/radio_if.py: reset UHD device time at startup ...................................................................... Patch Set 1: Verified+1 Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10418/1/python/trx/radio_if.py File python/trx/radio_if.py: https://gerrit.osmocom.org/#/c/10418/1/python/trx/radio_if.py at 264 PS1, Line 264: self.phy_sink.set_time_now(uhd.time_spec(0.0)) set_time_now needs to be done only once, either for source or sink (I'm having fun with gerrit review window ;) ) -- To view, visit https://gerrit.osmocom.org/10418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 Gerrit-Change-Number: 10418 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:27:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:39:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 09:39:11 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup In-Reply-To: References: Message-ID: Hello Piotr Krysik, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10418 to look at the new patch set (#2). Change subject: trx/radio_if.py: reset UHD device time at startup ...................................................................... trx/radio_if.py: reset UHD device time at startup Some UHD devices, such as UmTRX, require one to manually reset the hardware clock, otherwise the burst transmission doesn't work. Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 --- M python/trx/radio_if.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/18/10418/2 -- To view, visit https://gerrit.osmocom.org/10418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 Gerrit-Change-Number: 10418 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:41:36 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10418 ) Change subject: trx/radio_if.py: reset UHD device time at startup ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 Gerrit-Change-Number: 10418 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:41:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:43:00 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:43:00 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10426 ) Change subject: apps/grgsm_trx: print bind / remote address and port ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87 Gerrit-Change-Number: 10426 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:43:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:13 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:13 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10425 ) Change subject: apps/grgsm_trx: introduce bind address option ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9 Gerrit-Change-Number: 10425 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:18 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:18 +0000 Subject: Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10424 ) Change subject: gsm_trx_burst_if: allow to customize the bind address ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6 Gerrit-Change-Number: 10424 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:24 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:24 +0000 Subject: Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10423 ) Change subject: trx/ctrl_if.py: send control responses to where commands are from ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196 Gerrit-Change-Number: 10423 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:30 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:30 +0000 Subject: Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10422 ) Change subject: trx/udp_link.py: set SO_REUSEADDR socket option ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 Gerrit-Change-Number: 10422 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:35 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:35 +0000 Subject: Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10421 ) Change subject: trx/udp_link.py: close socket in destructor ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae Gerrit-Change-Number: 10421 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:41 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:41 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10420 ) Change subject: apps/grgsm_trx: use format string for help message ...................................................................... Patch Set 2: Verified+1 Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10420/1/apps/grgsm_trx File apps/grgsm_trx: https://gerrit.osmocom.org/#/c/10420/1/apps/grgsm_trx at 99 PS1, Line 99: note: for parsing arguments we could use optparse (https://docs.python.org/2/library/optparse.html) or argparse (https://docs.python.org/2/library/argparse.html#module-argparse) -- To view, visit https://gerrit.osmocom.org/10420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d Gerrit-Change-Number: 10420 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:47 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:47 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10419 ) Change subject: trx/radio_if.py: drop useless import of osmosdr ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 Gerrit-Change-Number: 10419 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:45:56 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:45:56 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700 In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10417 ) Change subject: grgsm_trx: change default TRX port number to 6700 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4 Gerrit-Change-Number: 10417 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:45:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:01 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:01 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder In-Reply-To: References: Message-ID: Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/10416 ) Change subject: apps/grgsm_trx: also print Piotr as a copyright holder ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744 Gerrit-Change-Number: 10416 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik Gerrit-Comment-Date: Fri, 10 Aug 2018 09:46:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:14 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:14 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: also print Piotr as a copyright holder In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10416 ) Change subject: apps/grgsm_trx: also print Piotr as a copyright holder ...................................................................... apps/grgsm_trx: also print Piotr as a copyright holder Despite the most part of Python code was written by Vadim, it's heavily based on huge and impressive work done by Piotr. Let's also print his credentials in the license header. Change-Id: Icca7c679d84f99440ff502219f624e0f73112744 --- M apps/grgsm_trx 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 128adab..eafc726 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -31,6 +31,7 @@ COPYRIGHT = \ "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \ + "Copyright (C) 2017 by Piotr Krysik \n" \ "License GPLv2+: GNU GPL version 2 or later " \ "\n" \ "This is free software: you are free to change and redistribute it.\n" \ -- To view, visit https://gerrit.osmocom.org/10416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icca7c679d84f99440ff502219f624e0f73112744 Gerrit-Change-Number: 10416 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:15 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:15 +0000 Subject: Change in gr-gsm[master]: grgsm_trx: change default TRX port number to 6700 In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10417 ) Change subject: grgsm_trx: change default TRX port number to 6700 ...................................................................... grgsm_trx: change default TRX port number to 6700 In order to avoid clashes with OsmoTRX, which may be also running on the same host, let's use a different port range starting from 6700 by default. This idea was introduced as a result of OS#2984. Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4 --- M apps/grgsm_trx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index eafc726..eb7fbdb 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -40,7 +40,7 @@ class Application: # Application variables remote_addr = "127.0.0.1" - base_port = 5700 + base_port = 6700 # PHY specific phy_sample_rate = 4 * 1625000 / 6 -- To view, visit https://gerrit.osmocom.org/10417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaf0c78733bfefcb0b0938abf6d316e27d03ecab4 Gerrit-Change-Number: 10417 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:16 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:16 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: reset UHD device time at startup In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10418 ) Change subject: trx/radio_if.py: reset UHD device time at startup ...................................................................... trx/radio_if.py: reset UHD device time at startup Some UHD devices, such as UmTRX, require one to manually reset the hardware clock, otherwise the burst transmission doesn't work. Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 --- M python/trx/radio_if.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 355312b..119b237 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -257,6 +257,12 @@ (self.dict_toggle_sign, 'dict_out'), (self.msg_to_tag_sink, 'msg')) + + # Some UHD devices (such as UmTRX) do start the clock + # not from 0, so it's required to reset it manually. + # Resetting UHD source will also affect the sink. + self.phy_src.set_time_now(uhd.time_spec(0.0)) + def shutdown(self): print("[i] Shutdown Radio interface") self.stop() -- To view, visit https://gerrit.osmocom.org/10418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idddc1387199bd22342ec5af25c8635e73352e315 Gerrit-Change-Number: 10418 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:16 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:16 +0000 Subject: Change in gr-gsm[master]: trx/radio_if.py: drop useless import of osmosdr In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10419 ) Change subject: trx/radio_if.py: drop useless import of osmosdr ...................................................................... trx/radio_if.py: drop useless import of osmosdr Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 --- M python/trx/radio_if.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 119b237..2648cc9 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -26,7 +26,6 @@ import pmt import time import grgsm -import osmosdr from math import pi -- To view, visit https://gerrit.osmocom.org/10419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iacd5ca118957e3ecf05df81f511b17bb9a8982b5 Gerrit-Change-Number: 10419 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:17 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:17 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: use format string for help message In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10420 ) Change subject: apps/grgsm_trx: use format string for help message ...................................................................... apps/grgsm_trx: use format string for help message Instead of using the hard-coded default values in help message, it makes sense to use a format string, and pass the actual values when printing help. Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d --- M apps/grgsm_trx 1 file changed, 15 insertions(+), 8 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index eb7fbdb..b925fc1 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -96,20 +96,27 @@ # TRX specific s += " TRX interface specific\n" \ - " -i --remote-addr Set remote address (default 127.0.0.1)\n" \ - " -p --base-port Set base port number (default 5700)\n\n" + " -i --remote-addr Set remote address (default %s)\n" \ + " -p --base-port Set base port number (default %d)\n\n" # PHY specific s += " Radio interface specific\n" \ " -a --device-args Set device arguments\n" \ " -s --sample-rate Set sample rate\n" \ - " -g --rx-gain Set RX gain (default 30)\n" \ - " -G --tx-gain Set TX gain (default 10)\n" \ - " --rx-antenna Set RX antenna (default RX2)\n" \ - " --tx-antenna Set TX antenna (default TX/RX)\n" \ - " --ppm Set frequency correction (default 0)\n" + " -g --rx-gain Set RX gain (default %d)\n" \ + " -G --tx-gain Set TX gain (default %d)\n" \ + " --rx-antenna Set RX antenna (default %s)\n" \ + " --tx-antenna Set TX antenna (default %s)\n" \ + " --ppm Set frequency correction (default %d)\n" - print(s) + print(s % ( + self.remote_addr, + self.base_port, + self.phy_rx_gain, + self.phy_tx_gain, + self.phy_rx_antenna, + self.phy_tx_antenna, + self.phy_ppm)) def parse_argv(self): try: -- To view, visit https://gerrit.osmocom.org/10420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1bf0ef3ded86aa92faeb9b63eb286283f5c8c3d Gerrit-Change-Number: 10420 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:18 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:18 +0000 Subject: Change in gr-gsm[master]: trx/udp_link.py: close socket in destructor In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10421 ) Change subject: trx/udp_link.py: close socket in destructor ...................................................................... trx/udp_link.py: close socket in destructor Previously it was required to call the UDPLink.shutdown() method manually in order to close a socket. Let's do it automatically using the destructor of UDPLink. Cherry-picked from: I59c3dc61ec58cd9effeb789947d28fd602ca91f4 Change-Id: Ief7aa21d1e50682a90616833b679741957193aae --- M apps/grgsm_trx M python/trx/ctrl_if_bb.py M python/trx/udp_link.py 3 files changed, 3 insertions(+), 8 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index b925fc1..668b0be 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -83,7 +83,6 @@ def shutdown(self): print("[i] Shutting down...") - self.server.shutdown() self.radio.shutdown() def print_copyright(self): diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index 5874e59..7886e23 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -35,10 +35,6 @@ # Power measurement self.pm = pm - def shutdown(self): - print("[i] Shutdown CTRL interface") - ctrl_if.shutdown(self) - def parse_cmd(self, request): # Power control if self.verify_cmd(request, "POWERON", 0): diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index 675ef5c..cedcb1b 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -35,6 +35,9 @@ self.remote_addr = remote_addr self.remote_port = remote_port + def __del__(self): + self.sock.close() + def loop(self): r_event, w_event, x_event = select.select([self.sock], [], []) @@ -43,9 +46,6 @@ data, addr = self.sock.recvfrom(128) self.handle_rx(data.decode()) - def shutdown(self): - self.sock.close(); - def send(self, data): if type(data) not in [bytearray, bytes]: data = data.encode() -- To view, visit https://gerrit.osmocom.org/10421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief7aa21d1e50682a90616833b679741957193aae Gerrit-Change-Number: 10421 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:18 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:18 +0000 Subject: Change in gr-gsm[master]: trx/udp_link.py: set SO_REUSEADDR socket option In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10422 ) Change subject: trx/udp_link.py: set SO_REUSEADDR socket option ...................................................................... trx/udp_link.py: set SO_REUSEADDR socket option Setting this option allows one to reuse existing connections, for example, by injecting CTRL commands or DATA bursts into existing connections. Cherry-picked from: I0882c76affa9a668a12d10967081054d2b666ed1 Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 --- M python/trx/udp_link.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index cedcb1b..1fae8b4 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -28,6 +28,7 @@ class udp_link: def __init__(self, remote_addr, remote_port, bind_port): self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self.sock.bind((remote_addr, bind_port)) self.sock.setblocking(0) -- To view, visit https://gerrit.osmocom.org/10422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6d256683a7aa0419cd5bd0a3eaa97aefdf3254f9 Gerrit-Change-Number: 10422 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:19 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:19 +0000 Subject: Change in gr-gsm[master]: trx/ctrl_if.py: send control responses to where commands are from In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10423 ) Change subject: trx/ctrl_if.py: send control responses to where commands are from ...................................................................... trx/ctrl_if.py: send control responses to where commands are from When we receive a control command, we should not simply send the response to the default destination, but send it back to the exact IP/prt from which the command originated. This ensures correct routing of responses even in case multiple programs are interfacing concurrently with a control socket. Cherry-picked from: I24a0bba6eed059b101af95dac7d059f34dd715fc Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196 --- M python/trx/ctrl_if.py M python/trx/udp_link.py 2 files changed, 12 insertions(+), 9 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py index 7dee0f8..ae5cf05 100644 --- a/python/trx/ctrl_if.py +++ b/python/trx/ctrl_if.py @@ -25,15 +25,15 @@ from grgsm.trx import udp_link class ctrl_if(udp_link): - def handle_rx(self, data): + def handle_rx(self, data, remote): if self.verify_req(data): request = self.prepare_req(data) rc = self.parse_cmd(request) if type(rc) is tuple: - self.send_response(request, rc[0], rc[1]) + self.send_response(request, remote, rc[0], rc[1]) else: - self.send_response(request, rc) + self.send_response(request, remote, rc) else: print("[!] Wrong data on CTRL interface") @@ -65,7 +65,7 @@ return True - def send_response(self, request, response_code, params = None): + def send_response(self, request, remote, response_code, params = None): # Include status code, for example ["TXTUNE", "0", "941600"] request.insert(1, str(response_code)) @@ -76,7 +76,7 @@ # Add the response signature, and join back to string response = "RSP " + " ".join(request) + "\0" # Now we have something like "RSP TXTUNE 0 941600" - self.send(response) + self.send(response, remote) def parse_cmd(self, request): raise NotImplementedError diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index 1fae8b4..d96a6aa 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -45,13 +45,16 @@ # Check for incoming data if self.sock in r_event: data, addr = self.sock.recvfrom(128) - self.handle_rx(data.decode()) + self.handle_rx(data.decode(), addr) - def send(self, data): + def send(self, data, remote = None): if type(data) not in [bytearray, bytes]: data = data.encode() - self.sock.sendto(data, (self.remote_addr, self.remote_port)) + if remote is None: + remote = (self.remote_addr, self.remote_port) - def handle_rx(self, data): + self.sock.sendto(data, remote) + + def handle_rx(self, data, remote): raise NotImplementedError -- To view, visit https://gerrit.osmocom.org/10423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1f304ea887dc957d3ad53adb1e3c56ab27d8f196 Gerrit-Change-Number: 10423 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:19 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:19 +0000 Subject: Change in gr-gsm[master]: gsm_trx_burst_if: allow to customize the bind address In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10424 ) Change subject: gsm_trx_burst_if: allow to customize the bind address ...................................................................... gsm_trx_burst_if: allow to customize the bind address Pleviously remote address for DATA interface was also used as the bind address, what is definitely wrong. Let's change the API a bit in order to allow one to specify a custom bind address. Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6 --- M grc/trx/gsm_trx_burst_if.xml M include/grgsm/misc_utils/udp_socket.h M include/grgsm/trx/trx_burst_if.h M lib/misc_utils/udp_socket.cc M lib/trx/trx_burst_if_impl.cc M lib/trx/trx_burst_if_impl.h M python/trx/radio_if.py 7 files changed, 26 insertions(+), 11 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/grc/trx/gsm_trx_burst_if.xml b/grc/trx/gsm_trx_burst_if.xml index 99427b3..49979a3 100644 --- a/grc/trx/gsm_trx_burst_if.xml +++ b/grc/trx/gsm_trx_burst_if.xml @@ -3,7 +3,7 @@ TRX Burst Interface gsm_trx_burst_if import grgsm - grgsm.trx_burst_if($remote_addr, $base_port) + grgsm.trx_burst_if($bind_addr, $remote_addr, $base_port) base_port @@ -13,6 +13,13 @@ + bind_addr + bind_addr + 0.0.0.0 + string + + + remote_addr remote_addr 127.0.0.1 diff --git a/include/grgsm/misc_utils/udp_socket.h b/include/grgsm/misc_utils/udp_socket.h index 15b2c66..d1ceb9f 100644 --- a/include/grgsm/misc_utils/udp_socket.h +++ b/include/grgsm/misc_utils/udp_socket.h @@ -53,8 +53,9 @@ public: udp_socket( - const std::string &remote_addr, + const std::string &bind_addr, const std::string &src_port, + const std::string &remote_addr, const std::string &dst_port, size_t mtu); ~udp_socket(); diff --git a/include/grgsm/trx/trx_burst_if.h b/include/grgsm/trx/trx_burst_if.h index 0e7a35a..9277dc5 100644 --- a/include/grgsm/trx/trx_burst_if.h +++ b/include/grgsm/trx/trx_burst_if.h @@ -48,6 +48,7 @@ * creating new instances. */ static sptr make( + const std::string &bind_addr, const std::string &remote_addr, const std::string &base_port); }; diff --git a/lib/misc_utils/udp_socket.cc b/lib/misc_utils/udp_socket.cc index 73393a0..c43f183 100644 --- a/lib/misc_utils/udp_socket.cc +++ b/lib/misc_utils/udp_socket.cc @@ -38,8 +38,9 @@ namespace gsm { udp_socket::udp_socket( - const std::string &remote_addr, + const std::string &bind_addr, const std::string &src_port, + const std::string &remote_addr, const std::string &dst_port, size_t mtu) { @@ -50,7 +51,7 @@ udp::resolver resolver(d_io_service); udp::resolver::query rx_query( - udp::v4(), remote_addr, src_port, + udp::v4(), bind_addr, src_port, boost::asio::ip::resolver_query_base::passive); udp::resolver::query tx_query( udp::v4(), remote_addr, dst_port, diff --git a/lib/trx/trx_burst_if_impl.cc b/lib/trx/trx_burst_if_impl.cc index e3fcc89..f72eecd 100644 --- a/lib/trx/trx_burst_if_impl.cc +++ b/lib/trx/trx_burst_if_impl.cc @@ -48,19 +48,22 @@ trx_burst_if::sptr trx_burst_if::make( + const std::string &bind_addr, const std::string &remote_addr, const std::string &base_port) { int base_port_int = boost::lexical_cast (base_port); return gnuradio::get_initial_sptr - (new trx_burst_if_impl(remote_addr, base_port_int)); + (new trx_burst_if_impl(bind_addr, remote_addr, + base_port_int)); } /* * The private constructor */ trx_burst_if_impl::trx_burst_if_impl( + const std::string &bind_addr, const std::string &remote_addr, int base_port ) : gr::block("trx_burst_if", @@ -79,8 +82,8 @@ std::string data_dst_port = boost::lexical_cast (base_port + 102); // Init DATA interface - d_data_sock = new udp_socket(remote_addr, - data_src_port, data_dst_port, DATA_IF_MTU); + d_data_sock = new udp_socket(bind_addr, data_src_port, + remote_addr, data_dst_port, DATA_IF_MTU); // Bind DATA interface handler d_data_sock->udp_rx_handler = boost::bind( diff --git a/lib/trx/trx_burst_if_impl.h b/lib/trx/trx_burst_if_impl.h index 27ec259..fdb49f2 100644 --- a/lib/trx/trx_burst_if_impl.h +++ b/lib/trx/trx_burst_if_impl.h @@ -40,7 +40,8 @@ void burst_pack(pmt::pmt_t msg, uint8_t *buf); public: - trx_burst_if_impl(const std::string &remote_addr, int base_port); + trx_burst_if_impl(const std::string &bind_addr, + const std::string &remote_addr, int base_port); ~trx_burst_if_impl(); void handle_dl_burst(pmt::pmt_t msg); diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 2648cc9..25a35a5 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -81,7 +81,8 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - trx_remote_addr, trx_base_port): + trx_remote_addr, trx_base_port, + trx_bind_addr = "0.0.0.0"): print("[i] Init Radio interface") @@ -95,8 +96,8 @@ # TRX Burst Interface self.trx_burst_if = grgsm.trx_burst_if( - trx_remote_addr, str(trx_base_port)) - + trx_bind_addr, trx_remote_addr, + str(trx_base_port)) # RX path definition self.phy_src = uhd.usrp_source(phy_args, -- To view, visit https://gerrit.osmocom.org/10424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e5f7b7119ac454217b8dd04f9ee0dd3b23972b6 Gerrit-Change-Number: 10424 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:20 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: introduce bind address option In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10425 ) Change subject: apps/grgsm_trx: introduce bind address option ...................................................................... apps/grgsm_trx: introduce bind address option The new option (-b --bind-addr) allows one to specify the bind address for both DATA and CTRL interfaces. By default, '0.0.0.0' is used, so there are no restrictions for the L1 source address. Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9 --- M apps/grgsm_trx M python/trx/ctrl_if_bb.py M python/trx/radio_if.py M python/trx/udp_link.py 4 files changed, 23 insertions(+), 15 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/apps/grgsm_trx b/apps/grgsm_trx index 668b0be..1c0581f 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -3,7 +3,7 @@ # GR-GSM based transceiver # -# (C) 2016-2017 by Vadim Yanitskiy +# (C) 2016-2018 by Vadim Yanitskiy # # All Rights Reserved # @@ -30,7 +30,7 @@ from grgsm.trx import fake_pm COPYRIGHT = \ - "Copyright (C) 2016-2017 by Vadim Yanitskiy \n" \ + "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ "Copyright (C) 2017 by Piotr Krysik \n" \ "License GPLv2+: GNU GPL version 2 or later " \ "\n" \ @@ -40,6 +40,7 @@ class Application: # Application variables remote_addr = "127.0.0.1" + bind_addr = "0.0.0.0" base_port = 6700 # PHY specific @@ -63,7 +64,8 @@ self.radio = radio_if(self.phy_args, self.phy_sample_rate, self.phy_rx_gain, self.phy_tx_gain, self.phy_ppm, self.phy_rx_antenna, self.phy_tx_antenna, - self.remote_addr, self.base_port) + self.bind_addr, self.remote_addr, + self.base_port) # Power measurement emulation # Noise: -120 .. -105 @@ -71,8 +73,9 @@ self.pm = fake_pm(-120, -105, -75, -50) # Init TRX CTRL interface - self.server = ctrl_if_bb(self.remote_addr, - self.base_port + 101, self.base_port + 1, + self.server = ctrl_if_bb( + self.remote_addr, self.base_port + 101, + self.bind_addr, self.base_port + 1, self.radio, self.pm) print("[i] Init complete") @@ -96,6 +99,7 @@ # TRX specific s += " TRX interface specific\n" \ " -i --remote-addr Set remote address (default %s)\n" \ + " -b --bind-addr Set bind address (default %s)\n" \ " -p --base-port Set base port number (default %d)\n\n" # PHY specific @@ -110,6 +114,7 @@ print(s % ( self.remote_addr, + self.bind_addr, self.base_port, self.phy_rx_gain, self.phy_tx_gain, @@ -120,10 +125,10 @@ def parse_argv(self): try: opts, args = getopt.getopt(sys.argv[1:], - "i:p:a:s:g:G:h", - ["help", "remote-addr=", "base-port=", "device-args=", - "sample-rate=", "rx-gain=", "tx-gain=", "ppm=", - "rx-antenna=", "tx-antenna="]) + "i:b:p:a:s:g:G:h", + ["help", "remote-addr=", "bind-addr=", "base-port=", + "device-args=", "sample-rate=", "rx-gain=", "tx-gain=", + "ppm=", "rx-antenna=", "tx-antenna="]) except getopt.GetoptError as err: # Print(help and exit) self.print_help() @@ -138,6 +143,8 @@ # TRX specific elif o in ("-i", "--remote-addr"): self.remote_addr = v + elif o in ("-b", "--bind-addr"): + self.bind_addr = v elif o in ("-p", "--base-port"): if int(v) >= 0 and int(v) <= 65535: self.base_port = int(v) diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index 7886e23..f5a9fa3 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -26,9 +26,10 @@ from ctrl_if import ctrl_if class ctrl_if_bb(ctrl_if): - def __init__(self, remote_addr, remote_port, bind_port, tb, pm): + def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm): print("[i] Init CTRL interface") - ctrl_if.__init__(self, remote_addr, remote_port, bind_port) + ctrl_if.__init__(self, remote_addr, remote_port, + bind_addr, bind_port) # Set link to the follow graph (top block) self.tb = tb diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 25a35a5..1c7f003 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -81,8 +81,8 @@ def __init__(self, phy_args, phy_sample_rate, phy_rx_gain, phy_tx_gain, phy_ppm, phy_rx_antenna, phy_tx_antenna, - trx_remote_addr, trx_base_port, - trx_bind_addr = "0.0.0.0"): + trx_bind_addr, trx_remote_addr, + trx_base_port): print("[i] Init Radio interface") diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index d96a6aa..efa701b 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -26,10 +26,10 @@ import select class udp_link: - def __init__(self, remote_addr, remote_port, bind_port): + def __init__(self, remote_addr, remote_port, bind_addr = '0.0.0.0', bind_port = 0): self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.sock.bind((remote_addr, bind_port)) + self.sock.bind((bind_addr, bind_port)) self.sock.setblocking(0) # Save remote info -- To view, visit https://gerrit.osmocom.org/10425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3339f686b53db07cfd1bff9a516f4bdc28058cd9 Gerrit-Change-Number: 10425 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 09:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (Piotr Krysik) Date: Fri, 10 Aug 2018 09:46:20 +0000 Subject: Change in gr-gsm[master]: apps/grgsm_trx: print bind / remote address and port In-Reply-To: References: Message-ID: Piotr Krysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/10426 ) Change subject: apps/grgsm_trx: print bind / remote address and port ...................................................................... apps/grgsm_trx: print bind / remote address and port Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87 --- M python/trx/ctrl_if_bb.py M python/trx/radio_if.py M python/trx/udp_link.py 3 files changed, 11 insertions(+), 2 deletions(-) Approvals: Piotr Krysik: Looks good to me, approved; Verified diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py index f5a9fa3..fe0002e 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/trx/ctrl_if_bb.py @@ -27,10 +27,11 @@ class ctrl_if_bb(ctrl_if): def __init__(self, remote_addr, remote_port, bind_addr, bind_port, tb, pm): - print("[i] Init CTRL interface") ctrl_if.__init__(self, remote_addr, remote_port, bind_addr, bind_port) + print("[i] Init CTRL interface (%s)" % self.desc_link()) + # Set link to the follow graph (top block) self.tb = tb # Power measurement diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py index 1c7f003..d2afcf6 100644 --- a/python/trx/radio_if.py +++ b/python/trx/radio_if.py @@ -84,7 +84,9 @@ trx_bind_addr, trx_remote_addr, trx_base_port): - print("[i] Init Radio interface") + print("[i] Init Radio interface (L:%s:%u <-> R:%s:%u)" + % (trx_bind_addr, trx_base_port + 2, + trx_remote_addr, trx_base_port + 102)) # PHY specific variables self.sample_rate = phy_sample_rate diff --git a/python/trx/udp_link.py b/python/trx/udp_link.py index efa701b..ad84e5a 100644 --- a/python/trx/udp_link.py +++ b/python/trx/udp_link.py @@ -47,6 +47,12 @@ data, addr = self.sock.recvfrom(128) self.handle_rx(data.decode(), addr) + def desc_link(self): + (bind_addr, bind_port) = self.sock.getsockname() + + return "L:%s:%u <-> R:%s:%u" \ + % (bind_addr, bind_port, self.remote_addr, self.remote_port) + def send(self, data, remote = None): if type(data) not in [bytearray, bytes]: data = data.encode() -- To view, visit https://gerrit.osmocom.org/10426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If750d476f3972f1ab5c5b637438d14d40b1e3d87 Gerrit-Change-Number: 10426 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Piotr Krysik -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 11:00:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 10 Aug 2018 11:00:55 +0000 Subject: Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10427 Change subject: util/Makefile.am: Fix build with builddir neq srcdir ...................................................................... util/Makefile.am: Fix build with builddir neq srcdir Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2 --- M util/Makefile.am 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libtelnet refs/changes/27/10427/1 diff --git a/util/Makefile.am b/util/Makefile.am index 9c66ef7..57f7fa6 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,9 +1,9 @@ -AM_CFLAGS = -I.. -AM_LDFLAGS = -L.. +AM_CFLAGS = -I$(srcdir)/.. +AM_LDFLAGS = -L$(builddir)/.. ipaccess_telnet_SOURCES = telnet-client.c ../libtelnet.h ipaccess-auth.c ipaccess_telnet_LDADD = ../libtelnet.la -lssl -lcrypto -ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I.. +ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I$(srcdir)/.. telnet_client_SOURCES = telnet-client.c ../libtelnet.h telnet_client_LDADD = ../libtelnet.la -- To view, visit https://gerrit.osmocom.org/10427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libtelnet Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2 Gerrit-Change-Number: 10427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 11:01:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 10 Aug 2018 11:01:33 +0000 Subject: Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10427 ) Change subject: util/Makefile.am: Fix build with builddir neq srcdir ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libtelnet Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2 Gerrit-Change-Number: 10427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 10 Aug 2018 11:01:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 11:02:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 10 Aug 2018 11:02:51 +0000 Subject: Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10427 ) Change subject: util/Makefile.am: Fix build with builddir neq srcdir ...................................................................... Patch Set 1: Please +2 it but don't merge it. This way I'll remember to update SRCREV in OE recipe when I merge it. -- To view, visit https://gerrit.osmocom.org/10427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libtelnet Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2 Gerrit-Change-Number: 10427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 10 Aug 2018 11:02:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 14:10:21 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 10 Aug 2018 14:10:21 +0000 Subject: Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10428 Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() ...................................................................... libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() lchan_type was removed from gsm_mncc and the hello message on initial import from legacy OpenBSC in Change-Id: Id3705236350d5f69e447046b0a764bbabc3d493c This patch follows on from Change-Id: Ia02373a36df7605507ee3de49173a9fd6547b726 which reintroduced lchan_type to the gsm_mncc struct. This patch restores the lchan_type_offset to the hello protocol message Without this patch, LCR will issue an error and disconnect from the MNCC socket. Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Closes: OS#3461 --- M src/libmsc/mncc_sock.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/10428/1 diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c index 74ea9d2..57b4bd8 100644 --- a/src/libmsc/mncc_sock.c +++ b/src/libmsc/mncc_sock.c @@ -228,6 +228,7 @@ hello->called_offset = offsetof(struct gsm_mncc, called); hello->signal_offset = offsetof(struct gsm_mncc, signal); hello->emergency_offset = offsetof(struct gsm_mncc, emergency); + hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type); msgb_enqueue(&mncc->net->upqueue, msg); mncc->conn_bfd.when |= BSC_FD_WRITE; -- To view, visit https://gerrit.osmocom.org/10428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Gerrit-Change-Number: 10428 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 14:31:41 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 10 Aug 2018 14:31:41 +0000 Subject: Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10428 to look at the new patch set (#2). Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() ...................................................................... libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() lchan_type was removed from gsm_mncc and the hello message on initial import from legacy OpenBSC in Change-Id: Id3705236350d5f69e447046b0a764bbabc3d493c This patch follows on from Change-Id: Ia02373a36df7605507ee3de49173a9fd6547b726 which reintroduced lchan_type to the gsm_mncc struct. This patch restores the lchan_type_offset to the hello protocol message Without this patch, LCR will issue an error and disconnect from the MNCC socket. Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Closes: OS#3461 --- M src/libmsc/mncc_sock.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/10428/2 -- To view, visit https://gerrit.osmocom.org/10428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Gerrit-Change-Number: 10428 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 10 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 10 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#211?= In-Reply-To: <2107895015.134.1533827406258.JavaMail.jenkins@jenkins.osmocom.org> References: <2107895015.134.1533827406258.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1567634219.150.1533913806327.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Aug 10 16:22:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 10 Aug 2018 16:22:43 +0000 Subject: Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10428 ) Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Gerrit-Change-Number: 10428 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 10 Aug 2018 16:22:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 19:46:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 10 Aug 2018 19:46:44 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem paths after HW setup changes Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10429 Change subject: resources.conf.prod: Update modem paths after HW setup changes ...................................................................... resources.conf.prod: Update modem paths after HW setup changes Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e --- M example/resources.conf.prod 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/29/10429/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 6023fc4..31a737c 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -96,28 +96,28 @@ modem: - label: sierra_1st - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.2' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.2' ki: 'EBAB63D06C3F546A16C977CB40E57C68' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: sierra_2nd - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.3' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.3' ki: 'EBD2B5F6CF3374106D0A66C11F922001' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20 - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.6' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' ki: '07F35D0A9476646169669401215580E0' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'ussd', 'gprs', 'sim'] - label: gobi2k - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.5' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' ki: '5752B3F43277C35D2D1D957007DF74E2' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] -- To view, visit https://gerrit.osmocom.org/10429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e Gerrit-Change-Number: 10429 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 19:53:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 10 Aug 2018 19:53:28 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem paths after HW setup changes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10429 ) Change subject: resources.conf.prod: Update modem paths after HW setup changes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e Gerrit-Change-Number: 10429 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 10 Aug 2018 19:53:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 20:03:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 10 Aug 2018 20:03:22 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem paths after HW setup changes In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10429 ) Change subject: resources.conf.prod: Update modem paths after HW setup changes ...................................................................... resources.conf.prod: Update modem paths after HW setup changes Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e --- M example/resources.conf.prod 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 6023fc4..31a737c 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -96,28 +96,28 @@ modem: - label: sierra_1st - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.2' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.2' ki: 'EBAB63D06C3F546A16C977CB40E57C68' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: sierra_2nd - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.3' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.3' ki: 'EBD2B5F6CF3374106D0A66C11F922001' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: ec20 - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.6' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' ki: '07F35D0A9476646169669401215580E0' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'ussd', 'gprs', 'sim'] - label: gobi2k - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.5' + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' ki: '5752B3F43277C35D2D1D957007DF74E2' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] -- To view, visit https://gerrit.osmocom.org/10429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8673af3e9447b8093bc61503f9354a8f0431620e Gerrit-Change-Number: 10429 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 20:59:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 20:59:00 +0000 Subject: Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10428 ) Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Gerrit-Change-Number: 10428 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 10 Aug 2018 20:59:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 20:59:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 20:59:01 +0000 Subject: Change in osmo-msc[master]: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10428 ) Change subject: libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() ...................................................................... libmsc/mncc_sock.c: Add lchan_type_offset in queue_hello() lchan_type was removed from gsm_mncc and the hello message on initial import from legacy OpenBSC in Change-Id: Id3705236350d5f69e447046b0a764bbabc3d493c This patch follows on from Change-Id: Ia02373a36df7605507ee3de49173a9fd6547b726 which reintroduced lchan_type to the gsm_mncc struct. This patch restores the lchan_type_offset to the hello protocol message Without this patch, LCR will issue an error and disconnect from the MNCC socket. Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Closes: OS#3461 --- M src/libmsc/mncc_sock.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c index 74ea9d2..57b4bd8 100644 --- a/src/libmsc/mncc_sock.c +++ b/src/libmsc/mncc_sock.c @@ -228,6 +228,7 @@ hello->called_offset = offsetof(struct gsm_mncc, called); hello->signal_offset = offsetof(struct gsm_mncc, signal); hello->emergency_offset = offsetof(struct gsm_mncc, emergency); + hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type); msgb_enqueue(&mncc->net->upqueue, msg); mncc->conn_bfd.when |= BSC_FD_WRITE; -- To view, visit https://gerrit.osmocom.org/10428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I65312082fa5dc0721170f923840e992ef9481a63 Gerrit-Change-Number: 10428 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 20:59:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 20:59:13 +0000 Subject: Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10427 ) Change subject: util/Makefile.am: Fix build with builddir neq srcdir ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libtelnet Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2 Gerrit-Change-Number: 10427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 10 Aug 2018 20:59:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 10 20:59:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 10 Aug 2018 20:59:15 +0000 Subject: Change in libtelnet[master]: util/Makefile.am: Fix build with builddir neq srcdir In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10427 ) Change subject: util/Makefile.am: Fix build with builddir neq srcdir ...................................................................... util/Makefile.am: Fix build with builddir neq srcdir Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2 --- M util/Makefile.am 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/util/Makefile.am b/util/Makefile.am index 9c66ef7..57f7fa6 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,9 +1,9 @@ -AM_CFLAGS = -I.. -AM_LDFLAGS = -L.. +AM_CFLAGS = -I$(srcdir)/.. +AM_LDFLAGS = -L$(builddir)/.. ipaccess_telnet_SOURCES = telnet-client.c ../libtelnet.h ipaccess-auth.c ipaccess_telnet_LDADD = ../libtelnet.la -lssl -lcrypto -ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I.. +ipaccess_telnet_CFLAGS = -DNANO_BTS_CLI_CLIENT -I$(srcdir)/.. telnet_client_SOURCES = telnet-client.c ../libtelnet.h telnet_client_LDADD = ../libtelnet.la -- To view, visit https://gerrit.osmocom.org/10427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libtelnet Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2ce5feeacda1f0b41de1d0a07d8c40ca09ad9fc2 Gerrit-Change-Number: 10427 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Aug 11 00:56:19 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 11 Aug 2018 00:56:19 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1783?= Message-ID: <1511023669.156.1533948979678.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 701.56 KB...] CC RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Requested-RAB-Parameter-MaxBitrateList.lo CC RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_RequestType.lo CC RANAP_ResidualBitErrorRatio.lo CC RANAP_ResponseTime.lo CC RANAP_RIMInformation.lo CC RANAP_RIM-Transfer.lo CC RANAP_RIMRoutingAddress.lo CC RANAP_RNC-ID.lo CC RANAP_RNCTraceInformation.lo CC RANAP_RNSAPRelocationParameters.lo CC RANAP_RRC-Container.lo CC RANAP_RTLoadValue.lo CC RANAP_RSRVCC-HO-Indication.lo CC RANAP_RSRVCC-Information.lo CC RANAP_RSRVCC-Operation-Possible.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from ../../include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h:14, from RANAP_RNSAPRelocationParameters.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: ?struct MemberN? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberN { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberN { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from ../../include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h:14, from RANAP_RNSAPRelocationParameters.c:7: ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: ?struct MemberB? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberB { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberB { ^~~~~~~~~~~~~ CC RANAP_SAC.lo CC RANAP_SAI.lo CC RANAP_SAPI.lo CC RANAP_SessionUpdateID.lo CC RANAP_Shared-Network-Information.lo CC RANAP_Session-Re-establishment-Indicator.lo CC RANAP_SignallingIndication.lo CC RANAP_SDU-ErrorRatio.lo CC RANAP_SDU-FormatInformationParameters.lo CC RANAP_SDU-FormatInformationParameterItem.lo CC RANAP_SDU-Parameters.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from ../../include/osmocom/ranap/RANAP_Shared-Network-Information.h:14, from RANAP_Shared-Network-Information.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: ?struct MemberA? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberA { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberA { ^~~~~~~~~~~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: ?struct MemberM? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberM { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberM { ^~~~~~~~~~~~~ CC RANAP_SDU-ParameterItem.lo CC RANAP_SNA-Access-Information.lo CC RANAP_SNAC.lo CC RANAP_Service-Handover.lo CC RANAP_Source-ToTarget-TransparentContainer.lo CC RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.lo CC RANAP_SourceCellID.lo CC RANAP_SourceBSS-ToTargetBSS-TransparentContainer.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:14, from ../../include/osmocom/ranap/RANAP_SNA-Access-Information.h:14, from RANAP_SNA-Access-Information.c:7: ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: ?struct MemberC? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberC { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberC { ^~~~~~~~~~~~~ CC RANAP_SourceID.lo CC RANAP_SourceRNC-ID.lo CC RANAP_SourceRNC-ToTargetRNC-TransparentContainer.lo CC RANAP_IRAT-Measurement-Configuration.lo CC RANAP_IRATmeasurementParameters.lo CC RANAP_RSRQ-Type.lo CC RANAP_RSRQ-Extension.lo CC RANAP_EUTRANFrequencies.lo CC RANAP_MeasBand.lo CC RANAP_SubscriberProfileIDforRFP.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from ../../include/osmocom/ranap/RANAP_IRATmeasurementParameters.h:15, from ../../include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h:15, from RANAP_IRAT-Measurement-Configuration.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: ?struct MemberJ? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberJ { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberJ { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from ../../include/osmocom/ranap/RANAP_IRATmeasurementParameters.h:15, from RANAP_IRATmeasurementParameters.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: ?struct MemberJ? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberJ { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberJ { ^~~~~~~~~~~~~ CC RANAP_SourceStatisticsDescriptor.lo CC RANAP_SupportedRAB-ParameterBitrateList.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from RANAP_EUTRANFrequencies.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: ?struct MemberJ? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberJ { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberJ { ^~~~~~~~~~~~~ CC RANAP_SupportedBitrate.lo CC RANAP_SourceUTRANCellID.lo CC RANAP_SRB-ID.lo CC RANAP_SRB-TrCH-Mapping.lo CC RANAP_SRB-TrCH-MappingItem.lo CC RANAP_SRVCC-HO-Indication.lo CC RANAP_SRVCC-Information.lo CC RANAP_SRVCC-Operation-Possible.lo CC RANAP_SubflowSDU-Size.lo CC RANAP_TAC.lo CC RANAP_TAI.lo CC RANAP_Target-ToSource-TransparentContainer.lo CC RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.lo CC RANAP_TargetBSS-ToSourceBSS-TransparentContainer.lo CC RANAP_TargetCellId.lo CC RANAP_TargetID.lo CC RANAP_TargetENB-ID.lo CC RANAP_TargetRNC-ID.lo CC RANAP_TargetRNC-ToSourceRNC-TransparentContainer.lo CC RANAP_TBCD-STRING.lo CC RANAP_TemporaryUE-ID.lo CC RANAP_Time-UE-StayedInCell.lo CC RANAP_Time-UE-StayedInCell-EnhancedGranularity.lo CC RANAP_TimeToMBMSDataTransfer.lo CC RANAP_TimingDifferenceULDL.lo CC RANAP_TMGI.lo CC RANAP_TMSI.lo CC RANAP_TraceDepth.lo CC RANAP_TraceInformation.lo CC RANAP_TracePropagationParameters.lo CC RANAP_TraceRecordingSessionInformation.lo CC RANAP_TraceRecordingSessionReference.lo CC RANAP_TraceReference.lo CC RANAP_TraceType.lo CC RANAP_TrafficClass.lo CC RANAP_TrafficHandlingPriority.lo CC RANAP_TransferDelay.lo CC RANAP_UnsuccessfullyTransmittedDataVolume.lo CC RANAP_TransportLayerAddress.lo CC RANAP_TrCH-ID.lo CC RANAP_TrCH-ID-List.lo CC RANAP_TriggerID.lo CC RANAP_TunnelInformation.lo CC RANAP_TypeOfError.lo CC RANAP_UE-AggregateMaximumBitRate.lo CC RANAP_UE-AggregateMaximumBitRateDownlink.lo CC RANAP_UE-AggregateMaximumBitRateUplink.lo CC RANAP_UE-History-Information.lo CC RANAP_UE-ID.lo CC RANAP_UESBI-Iu.lo CC RANAP_UESBI-IuA.lo CC RANAP_UESBI-IuB.lo CC RANAP_UL-GTP-PDU-SequenceNumber.lo CC RANAP_UL-N-PDU-SequenceNumber.lo CC RANAP_UPInformation.lo CC RANAP_UPInitialisationFrame.lo CC RANAP_UP-ModeVersions.lo CC RANAP_USCH-ID.lo CC RANAP_UserPlaneMode.lo CC RANAP_UTRAN-CellID.lo CC RANAP_VelocityEstimate.lo CC RANAP_HorizontalVelocity.lo CC RANAP_HorizontalWithVerticalVelocity.lo CC RANAP_HorizontalVelocityWithUncertainty.lo CC RANAP_HorizontalWithVerticalVelocityAndUncertainty.lo CC RANAP_HorizontalSpeedAndBearing.lo CC RANAP_VerticalVelocity.lo CC RANAP_VerticalSpeedDirection.lo CC RANAP_VerticalAccuracyCode.lo CC RANAP_VoiceSupportMatchIndicator.lo CC RANAP_RANAP-PDU.lo CC RANAP_InitiatingMessage.lo CC RANAP_UnsuccessfulOutcome.lo CC RANAP_SuccessfulOutcome.lo CC RANAP_Outcome.lo CC RANAP_Iu-ReleaseCommand.lo CC RANAP_Iu-ReleaseComplete.lo CC RANAP_RelocationRequired.lo CC RANAP_RelocationCommand.lo CC RANAP_RelocationPreparationFailure.lo CC RANAP_RelocationRequest.lo /bin/bash: line 1: 23332 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.3-2d3f\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.3-2d3f\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.3-2d3f\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_RelocationPreparationFailure.lo -MD -MP -MF .deps/RANAP_RelocationPreparationFailure.Tpo -c -o RANAP_RelocationPreparationFailure.lo RANAP_RelocationPreparationFailure.c Makefile:2505: recipe for target 'RANAP_RelocationPreparationFailure.lo' failed make[4]: *** [RANAP_RelocationPreparationFailure.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... CC RANAP_RelocationRequestAcknowledge.lo make[4]: Leaving directory ' Makefile:641: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:453: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:454: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:378: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Aug 11 06:20:58 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 11 Aug 2018 06:20:58 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1784?= In-Reply-To: <1511023669.156.1533948979678.JavaMail.jenkins@jenkins.osmocom.org> References: <1511023669.156.1533948979678.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1504907548.161.1533968458163.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Aug 11 11:51:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 11:51:12 +0000 Subject: Change in osmocom-bb[master]: layer23: Add --enable-sanitize and --enable-werror configure flags Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10430 Change subject: layer23: Add --enable-sanitize and --enable-werror configure flags ...................................................................... layer23: Add --enable-sanitize and --enable-werror configure flags We use this in the network-side Osmocom projects (CNI) and it's useful to have the same flags also for the OsmocomBB host software. Change-Id: I45800c937d665fdbd2dd6b0cee38408f587f1a9f --- M src/host/layer23/configure.ac 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/30/10430/1 diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index a5938c7..3e69610 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -11,6 +11,33 @@ AC_PROG_INSTALL AC_PROG_RANLIB +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING([--enable-sanitize], [Compile with address sanitizer enabled], )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + dnl checks for libraries PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -- To view, visit https://gerrit.osmocom.org/10430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I45800c937d665fdbd2dd6b0cee38408f587f1a9f Gerrit-Change-Number: 10430 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 11:51:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 11:51:13 +0000 Subject: Change in osmocom-bb[master]: layer23: fix unaligned store in osmo_send_l1() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10431 Change subject: layer23: fix unaligned store in osmo_send_l1() ...................................................................... layer23: fix unaligned store in osmo_send_l1() This fixes the following alignment issue uncovered by asan: l1l2_interface.c:169:7: runtime error: store to misaligned address 0x61600001ab99 for type 'uint16_t', which requires 2 byte alignment 0x61600001ab99: note: pointer points here 00 00 00 00 00 00 06 0a 01 19 19 40 18 00 07 00 01 03 49 06 15 00 40 01 c0 00 00 00 00 00 00 00 ^ Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c --- M src/host/layer23/src/common/l1l2_interface.c 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/10431/1 diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index d89995d..956279d 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -157,16 +157,13 @@ int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg) { - uint16_t *len; - DEBUGP(DL1C, "Sending: '%s'\n", osmo_hexdump(msg->data, msg->len)); if (msg->l1h != msg->data) LOGP(DL1C, LOGL_ERROR, "Message L1 header != Message Data\n"); - + /* prepend 16bit length before sending */ - len = (uint16_t *) msgb_push(msg, sizeof(*len)); - *len = htons(msg->len - sizeof(*len)); + msgb_push_u16(msg, msg->len); if (osmo_wqueue_enqueue(&ms->l2_wq, msg) != 0) { LOGP(DL1C, LOGL_ERROR, "Failed to enqueue msg.\n"); -- To view, visit https://gerrit.osmocom.org/10431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c Gerrit-Change-Number: 10431 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 11:51:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 11:51:14 +0000 Subject: Change in osmocom-bb[master]: trxcon: suppress WARNING log message on NEIGH_PM_REQ Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10432 Change subject: trxcon: suppress WARNING log message on NEIGH_PM_REQ ...................................................................... trxcon: suppress WARNING log message on NEIGH_PM_REQ Let's differentiate between an 'expected' unimplemented message like L1CTL_NEIGH_PM_REQ and a truly unknonw message type This makes the following WARNING messages disappear: <0001> l1ctl.c:798 Unknown MSG type 26: 1a 00 00 00 01 00 00 64 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 --- M src/host/trxcon/l1ctl.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/10432/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 74400be..134425f 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -793,6 +793,9 @@ return l1ctl_rx_tch_mode_req(l1l, msg); case L1CTL_CRYPTO_REQ: return l1ctl_rx_crypto_req(l1l, msg); + case L1CTL_NEIGH_PM_REQ: + LOGP(DL1C, LOGL_DEBUG, "Ignoring L1CTL_NEIGH_PM_REQ\n"); + return -EINVAL; default: LOGP(DL1C, LOGL_ERROR, "Unknown MSG type %u: %s\n", l1h->msg_type, osmo_hexdump(msgb_data(msg), msgb_length(msg))); -- To view, visit https://gerrit.osmocom.org/10432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 Gerrit-Change-Number: 10432 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 11:57:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 11 Aug 2018 11:57:49 +0000 Subject: Change in osmocom-bb[master]: layer23: Add --enable-sanitize and --enable-werror configure flags In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10430 ) Change subject: layer23: Add --enable-sanitize and --enable-werror configure flags ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45800c937d665fdbd2dd6b0cee38408f587f1a9f Gerrit-Change-Number: 10430 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 11:57:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:02:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 11 Aug 2018 12:02:26 +0000 Subject: Change in osmocom-bb[master]: layer23: fix unaligned store in osmo_send_l1() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10431 ) Change subject: layer23: fix unaligned store in osmo_send_l1() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c Gerrit-Change-Number: 10431 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 12:02:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:03:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:03:01 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warning about snprintf buffer too small Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10433 Change subject: layer23: Fix compiler warning about snprintf buffer too small ...................................................................... layer23: Fix compiler warning about snprintf buffer too small gsm322.c:366:22: warning: ?sprintf? may write a terminating nul past the end of the destination [-Wformat-overflow=] sprintf(string, "-%d", 110 - rxlev); ^ gsm322.c:366:2: note: ?sprintf? output between 3 and 6 bytes into a destination of size 5 sprintf(string, "-%d", 110 - rxlev); Change-Id: I7b19fef89ba0cb0c1edbdd62c46ad8395e44145b --- M src/host/layer23/src/mobile/gsm322.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/10433/1 diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index c3485b6..21cf8f3 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -358,7 +358,7 @@ char *gsm_print_rxlev(uint8_t rxlev) { - static char string[5]; + static char string[6]; if (rxlev == 0) return "<=-110"; if (rxlev >= 63) -- To view, visit https://gerrit.osmocom.org/10433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7b19fef89ba0cb0c1edbdd62c46ad8395e44145b Gerrit-Change-Number: 10433 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:03:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:03:02 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warnings about string operation truncation Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10434 Change subject: layer23: Fix compiler warnings about string operation truncation ...................................................................... layer23: Fix compiler warnings about string operation truncation This fixes the below warnings: gsm322.c: In function ?gsm322_cs_ba_range?: gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(lower_text, gsm_print_arfcn(index2arfcn(lower)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] gsm322.c:3481:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(higher_text, gsm_print_arfcn(index2arfcn(higher)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_cs_powerscan?: gsm322.c:2862:2: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(s_text, gsm_print_arfcn(index2arfcn(s)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gsm322.c:2863:2: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(e_text, gsm_print_arfcn(index2arfcn(e)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I08f938cfb2589574e90d5831a00c0140f71d5bfe --- M src/host/layer23/src/mobile/gsm322.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/34/10434/1 diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 21cf8f3..f23c796 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -2859,8 +2859,8 @@ } } - strncpy(s_text, gsm_print_arfcn(index2arfcn(s)), ARFCN_TEXT_LEN); - strncpy(e_text, gsm_print_arfcn(index2arfcn(e)), ARFCN_TEXT_LEN); + osmo_strlcpy(s_text, gsm_print_arfcn(index2arfcn(s)), ARFCN_TEXT_LEN); + osmo_strlcpy(e_text, gsm_print_arfcn(index2arfcn(e)), ARFCN_TEXT_LEN); LOGP(DCS, LOGL_DEBUG, "Scanning frequencies. (%s..%s)\n", s_text, e_text); @@ -3477,8 +3477,8 @@ higher += 1024-512; } range++; - strncpy(lower_text, gsm_print_arfcn(index2arfcn(lower)), ARFCN_TEXT_LEN); - strncpy(higher_text, gsm_print_arfcn(index2arfcn(higher)), ARFCN_TEXT_LEN); + osmo_strlcpy(lower_text, gsm_print_arfcn(index2arfcn(lower)), ARFCN_TEXT_LEN); + osmo_strlcpy(higher_text, gsm_print_arfcn(index2arfcn(higher)), ARFCN_TEXT_LEN); LOGP(DCS, LOGL_INFO, "Use BA range: %s..%s\n", lower_text, higher_text); -- To view, visit https://gerrit.osmocom.org/10434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I08f938cfb2589574e90d5831a00c0140f71d5bfe Gerrit-Change-Number: 10434 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:03:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:03:02 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_strlcpy() to avoid non-terminated strings Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10435 Change subject: layer23: Use osmo_strlcpy() to avoid non-terminated strings ...................................................................... layer23: Use osmo_strlcpy() to avoid non-terminated strings settings.c:191:2: warning: ?strncpy? output may be truncated copying 15 bytes from a string of length 15 -Wstringop-truncation] strncpy(set->imeisv, set->imei, 15); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o mncc_sock.c: In function ?osmo_unixsock_listen?: mncc_sock.c:318:2: warning: ?strncpy? specified bound 108 equals destination size [-Wstringop-truncation] strncpy(local.sun_path, path, sizeof(local.sun_path)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC script_lua.o vty_interface.c: In function ?cfg_gps_device?: vty_interface.c:1144:2: warning: ?strncpy? specified bound 32 equals destination size [-Wstringop-truncation] strncpy(g.device, argv[0], sizeof(g.device)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ AR libmobile.a Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1 --- M src/host/layer23/src/mobile/mncc_sock.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/35/10435/1 diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 7315927..39eb7bc 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -315,7 +315,7 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, path, sizeof(local.sun_path)); + osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)); local.sun_path[sizeof(local.sun_path) - 1] = '\0'; unlink(local.sun_path); diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 7370b0a..11c7f7b 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -188,7 +188,7 @@ sprintf(rand + 8, "%07ld", random() % 10000000); strcpy(set->imei + 15 - digits, rand + 15 - digits); - strncpy(set->imeisv, set->imei, 15); + osmo_strlcpy(set->imeisv, set->imei, 15); return 0; } diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index ec1216f..4adcf90 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1141,7 +1141,7 @@ "GPS receiver\nSelect serial device\n" "Full path of serial device including /dev/") { - strncpy(g.device, argv[0], sizeof(g.device)); + osmo_strlcpy(g.device, argv[0], sizeof(g.device)); g.device[sizeof(g.device) - 1] = '\0'; g.gps_type = GPS_TYPE_SERIAL; if (g.enable) { -- To view, visit https://gerrit.osmocom.org/10435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1 Gerrit-Change-Number: 10435 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:03:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:03:02 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix possible buffer overflow writing NUL beyond end of string Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10436 Change subject: layer23: Fix possible buffer overflow writing NUL beyond end of string ...................................................................... layer23: Fix possible buffer overflow writing NUL beyond end of string settings.c: In function ?gsm_random_imei?: settings.c:188:26: warning: ?sprintf? may write a terminating nul past the end of the destination [-Wformat-overflow=] sprintf(rand + 8, "%07ld", random() % 10000000); ^ settings.c:188:2: note: ?sprintf? output between 8 and 9 bytes into a destination of size 8 sprintf(rand + 8, "%07ld", random() % 10000000); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: Id949487111235cd4af5ff068f1dce2f4b0801480 --- M src/host/layer23/src/mobile/settings.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/10436/1 diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 11c7f7b..9783583 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -177,7 +177,7 @@ int gsm_random_imei(struct gsm_settings *set) { int digits = set->imei_random; - char rand[16]; + char rand[16+1]; if (digits <= 0) return 0; -- To view, visit https://gerrit.osmocom.org/10436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id949487111235cd4af5ff068f1dce2f4b0801480 Gerrit-Change-Number: 10436 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:04:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:04:01 +0000 Subject: Change in osmocom-bb[master]: layer23: Add --enable-sanitize and --enable-werror configure flags In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10430 ) Change subject: layer23: Add --enable-sanitize and --enable-werror configure flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45800c937d665fdbd2dd6b0cee38408f587f1a9f Gerrit-Change-Number: 10430 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 12:04:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:04:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:04:16 +0000 Subject: Change in osmocom-bb[master]: layer23: fix unaligned store in osmo_send_l1() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10431 ) Change subject: layer23: fix unaligned store in osmo_send_l1() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c Gerrit-Change-Number: 10431 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 12:04:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:04:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:04:33 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warning about snprintf buffer too small In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10433 ) Change subject: layer23: Fix compiler warning about snprintf buffer too small ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b19fef89ba0cb0c1edbdd62c46ad8395e44145b Gerrit-Change-Number: 10433 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 11 Aug 2018 12:04:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:04:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:04:35 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warnings about string operation truncation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10434 ) Change subject: layer23: Fix compiler warnings about string operation truncation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08f938cfb2589574e90d5831a00c0140f71d5bfe Gerrit-Change-Number: 10434 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 11 Aug 2018 12:04:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:04:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:04:42 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_strlcpy() to avoid non-terminated strings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10435 ) Change subject: layer23: Use osmo_strlcpy() to avoid non-terminated strings ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1 Gerrit-Change-Number: 10435 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 11 Aug 2018 12:04:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:04:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:04:46 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix possible buffer overflow writing NUL beyond end of string In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10436 ) Change subject: layer23: Fix possible buffer overflow writing NUL beyond end of string ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id949487111235cd4af5ff068f1dce2f4b0801480 Gerrit-Change-Number: 10436 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 11 Aug 2018 12:04:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:05:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 11 Aug 2018 12:05:37 +0000 Subject: Change in osmocom-bb[master]: trxcon: suppress WARNING log message on NEIGH_PM_REQ In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10432 ) Change subject: trxcon: suppress WARNING log message on NEIGH_PM_REQ ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10432/1/src/host/trxcon/l1ctl.c File src/host/trxcon/l1ctl.c: https://gerrit.osmocom.org/#/c/10432/1/src/host/trxcon/l1ctl.c at 796 PS1, Line 796: case L1CTL_NEIGH_PM_REQ: I think it makes much more sense to define _L1CTL_MAX, and check if a message is within the range or not, instead of adding such warnings for each (yet) unsupported message... -- To view, visit https://gerrit.osmocom.org/10432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 Gerrit-Change-Number: 10432 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 12:05:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:09:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 11 Aug 2018 12:09:07 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warning about snprintf buffer too small In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10433 ) Change subject: layer23: Fix compiler warning about snprintf buffer too small ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b19fef89ba0cb0c1edbdd62c46ad8395e44145b Gerrit-Change-Number: 10433 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 12:09:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:09:31 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 11 Aug 2018 12:09:31 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warnings about string operation truncation In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10434 ) Change subject: layer23: Fix compiler warnings about string operation truncation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08f938cfb2589574e90d5831a00c0140f71d5bfe Gerrit-Change-Number: 10434 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 12:09:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:09:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sat, 11 Aug 2018 12:09:55 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_strlcpy() to avoid non-terminated strings In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10435 ) Change subject: layer23: Use osmo_strlcpy() to avoid non-terminated strings ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1 Gerrit-Change-Number: 10435 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 11 Aug 2018 12:09:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:16:07 +0000 Subject: Change in osmocom-bb[master]: layer23: Replace all instances of strncpy() by osmo_strlcpy Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10437 Change subject: layer23: Replace all instances of strncpy() by osmo_strlcpy ...................................................................... layer23: Replace all instances of strncpy() by osmo_strlcpy This gives us working/safe zero termination without overflowing the destination string size. Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/subscriber.c M src/host/layer23/src/mobile/vty_interface.c 7 files changed, 15 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/10437/1 diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 956279d..4d8f740 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -114,7 +114,7 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, socket_path, sizeof(local.sun_path)); + osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); local.sun_path[sizeof(local.sun_path) - 1] = '\0'; rc = connect(ms->l2_wq.bfd.fd, (struct sockaddr *) &local, diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index fd19659..645f434 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -508,7 +508,7 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, socket_path, sizeof(local.sun_path)); + osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); local.sun_path[sizeof(local.sun_path) - 1] = '\0'; rc = connect(ms->sap_wq.bfd.fd, (struct sockaddr *) &local, sizeof(local)); @@ -572,7 +572,7 @@ { struct gsm_settings *set = &ms->settings; memset(set->sap_socket_path, 0, sizeof(set->sap_socket_path)); - strncpy(set->sap_socket_path, path, sizeof(set->sap_socket_path) - 1); + osmo_strlcpy(set->sap_socket_path, path, sizeof(set->sap_socket_path) - 1); return 0; } diff --git a/src/host/layer23/src/mobile/gsm411_sms.c b/src/host/layer23/src/mobile/gsm411_sms.c index 623ba53..c476ff4 100644 --- a/src/host/layer23/src/mobile/gsm411_sms.c +++ b/src/host/layer23/src/mobile/gsm411_sms.c @@ -104,7 +104,7 @@ if (!sms) return NULL; - strncpy(sms->text, text, sizeof(sms->text)-1); + OSMO_STRLCPY_ARRAY(sms->text, text); /* FIXME: don't use ID 1 static */ sms->reply_path_req = 0; @@ -112,7 +112,7 @@ sms->ud_hdr_ind = 0; sms->protocol_id = 0; /* implicit */ sms->data_coding_scheme = dcs; - strncpy(sms->address, receiver, sizeof(sms->address)-1); + OSMO_STRLCPY_ARRAY(sms->address, receiver); /* Generate user_data */ sms->user_data_len = gsm_7bit_encode_n(sms->user_data, sizeof(sms->user_data), sms->text, NULL); diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index ee2c943..2869ce6 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -200,8 +200,7 @@ if (response) { char text[256], *t = text, *s; - strncpy(text, response, sizeof(text) - 1); - text[sizeof(text) - 1] = '\0'; + OSMO_STRLCPY_ARRAY(text, response); while ((s = strchr(text, '\r'))) *s = '\n'; while ((s = strsep(&t, "\n"))) { @@ -655,9 +654,7 @@ /* register */ if (ss_code && to && to[0] == '*') { - strncpy(dest, to + 1, sizeof(dest) - 1); - dest[sizeof(dest) - 1] = '\0'; - dest[strlen(dest) - 1] = '\0'; + OSMO_STRLCPY_ARRAY(dest, to + 1); return gsm480_tx_cf(trans, GSM0480_MTYPE_REGISTER, GSM0480_OP_CODE_REGISTER_SS, ss_code, dest); } diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index b8c2558..9be9c8f 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -576,8 +576,7 @@ setup.called.type = 0; /* auto/unknown - prefix must be used */ setup.called.plan = 1; /* ISDN */ - strncpy(setup.called.number, number, - sizeof(setup.called.number) - 1); + OSMO_STRLCPY_ARRAY(setup.called.number, number); /* bearer capability (mandatory) */ mncc_set_bearer(ms, -1, &setup); @@ -808,7 +807,7 @@ } call->dtmf_index = 0; - strncpy(call->dtmf, dtmf, sizeof(call->dtmf) - 1); + OSMO_STRLCPY_ARRAY(call->dtmf, dtmf); return dtmf_statemachine(call, NULL); } diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 6a30148..7a01141 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -256,7 +256,7 @@ return -EINVAL; } - strncpy(subscr->imsi, imsi + 1, sizeof(subscr->imsi) - 1); + OSMO_STRLCPY_ARRAY(subscr->imsi, imsi + 1); LOGP(DMM, LOGL_INFO, "received IMSI %s from SIM\n", subscr->imsi); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 4adcf90..12c32a5 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1582,8 +1582,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - strncpy(set->layer2_socket_path, argv[0], - sizeof(set->layer2_socket_path) - 1); + OSMO_STRLCPY_ARRAY(set->layer2_socket_path, argv[0]); vty_restart(vty, ms); return CMD_SUCCESS; @@ -1596,8 +1595,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - strncpy(set->sap_socket_path, argv[0], - sizeof(set->sap_socket_path) - 1); + OSMO_STRLCPY_ARRAY(set->sap_socket_path, argv[0]); vty_restart(vty, ms); return CMD_SUCCESS; @@ -2134,10 +2132,10 @@ return CMD_WARNING; } llist_add_tail(&abbrev->list, &set->abbrev); - strncpy(abbrev->abbrev, argv[0], sizeof(abbrev->abbrev) - 1); - strncpy(abbrev->number, argv[1], sizeof(abbrev->number) - 1); + OSMO_STRLCPY_ARRAY(abbrev->abbrev, argv[0]); + OSMO_STRLCPY_ARRAY(abbrev->number, argv[1]); if (argc >= 3) - strncpy(abbrev->name, argv[2], sizeof(abbrev->name) - 1); + OSMO_STRLCPY_ARRAY(abbrev->name, argv[2]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 Gerrit-Change-Number: 10437 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:59:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:59:30 +0000 Subject: Change in osmocom-bb[master]: layer23: Add --enable-sanitize and --enable-werror configure flags In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10430 ) Change subject: layer23: Add --enable-sanitize and --enable-werror configure flags ...................................................................... layer23: Add --enable-sanitize and --enable-werror configure flags We use this in the network-side Osmocom projects (CNI) and it's useful to have the same flags also for the OsmocomBB host software. Change-Id: I45800c937d665fdbd2dd6b0cee38408f587f1a9f --- M src/host/layer23/configure.ac 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index a5938c7..3e69610 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -11,6 +11,33 @@ AC_PROG_INSTALL AC_PROG_RANLIB +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING([--enable-sanitize], [Compile with address sanitizer enabled], )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + dnl checks for libraries PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -- To view, visit https://gerrit.osmocom.org/10430 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I45800c937d665fdbd2dd6b0cee38408f587f1a9f Gerrit-Change-Number: 10430 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:59:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:59:31 +0000 Subject: Change in osmocom-bb[master]: layer23: fix unaligned store in osmo_send_l1() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10431 ) Change subject: layer23: fix unaligned store in osmo_send_l1() ...................................................................... layer23: fix unaligned store in osmo_send_l1() This fixes the following alignment issue uncovered by asan: l1l2_interface.c:169:7: runtime error: store to misaligned address 0x61600001ab99 for type 'uint16_t', which requires 2 byte alignment 0x61600001ab99: note: pointer points here 00 00 00 00 00 00 06 0a 01 19 19 40 18 00 07 00 01 03 49 06 15 00 40 01 c0 00 00 00 00 00 00 00 ^ Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c --- M src/host/layer23/src/common/l1l2_interface.c 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index d89995d..956279d 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -157,16 +157,13 @@ int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg) { - uint16_t *len; - DEBUGP(DL1C, "Sending: '%s'\n", osmo_hexdump(msg->data, msg->len)); if (msg->l1h != msg->data) LOGP(DL1C, LOGL_ERROR, "Message L1 header != Message Data\n"); - + /* prepend 16bit length before sending */ - len = (uint16_t *) msgb_push(msg, sizeof(*len)); - *len = htons(msg->len - sizeof(*len)); + msgb_push_u16(msg, msg->len); if (osmo_wqueue_enqueue(&ms->l2_wq, msg) != 0) { LOGP(DL1C, LOGL_ERROR, "Failed to enqueue msg.\n"); -- To view, visit https://gerrit.osmocom.org/10431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie65b428107d35bac99bc870fdbc4dc509ca2f33c Gerrit-Change-Number: 10431 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:59:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:59:31 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warning about snprintf buffer too small In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10433 ) Change subject: layer23: Fix compiler warning about snprintf buffer too small ...................................................................... layer23: Fix compiler warning about snprintf buffer too small gsm322.c:366:22: warning: ?sprintf? may write a terminating nul past the end of the destination [-Wformat-overflow=] sprintf(string, "-%d", 110 - rxlev); ^ gsm322.c:366:2: note: ?sprintf? output between 3 and 6 bytes into a destination of size 5 sprintf(string, "-%d", 110 - rxlev); Change-Id: I7b19fef89ba0cb0c1edbdd62c46ad8395e44145b --- M src/host/layer23/src/mobile/gsm322.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 3bc8b5c..a2cbb86 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -358,7 +358,7 @@ char *gsm_print_rxlev(uint8_t rxlev) { - static char string[5]; + static char string[6]; if (rxlev == 0) return "<=-110"; if (rxlev >= 63) -- To view, visit https://gerrit.osmocom.org/10433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7b19fef89ba0cb0c1edbdd62c46ad8395e44145b Gerrit-Change-Number: 10433 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:59:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:59:31 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix compiler warnings about string operation truncation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10434 ) Change subject: layer23: Fix compiler warnings about string operation truncation ...................................................................... layer23: Fix compiler warnings about string operation truncation This fixes the below warnings: gsm322.c: In function ?gsm322_cs_ba_range?: gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(lower_text, gsm_print_arfcn(index2arfcn(lower)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] gsm322.c:3480:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] gsm322.c:3481:3: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(higher_text, gsm_print_arfcn(index2arfcn(higher)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gsm322.c: In function ?gsm322_cs_powerscan?: gsm322.c:2862:2: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(s_text, gsm_print_arfcn(index2arfcn(s)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gsm322.c:2863:2: warning: ?strncpy? specified bound 10 equals destination size [-Wstringop-truncation] strncpy(e_text, gsm_print_arfcn(index2arfcn(e)), ARFCN_TEXT_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I08f938cfb2589574e90d5831a00c0140f71d5bfe --- M src/host/layer23/src/mobile/gsm322.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index a2cbb86..f2b51df 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -2859,8 +2859,8 @@ } } - strncpy(s_text, gsm_print_arfcn(index2arfcn(s)), ARFCN_TEXT_LEN); - strncpy(e_text, gsm_print_arfcn(index2arfcn(e)), ARFCN_TEXT_LEN); + osmo_strlcpy(s_text, gsm_print_arfcn(index2arfcn(s)), ARFCN_TEXT_LEN); + osmo_strlcpy(e_text, gsm_print_arfcn(index2arfcn(e)), ARFCN_TEXT_LEN); LOGP(DCS, LOGL_DEBUG, "Scanning frequencies. (%s..%s)\n", s_text, e_text); @@ -3477,8 +3477,8 @@ higher += 1024-512; } range++; - strncpy(lower_text, gsm_print_arfcn(index2arfcn(lower)), ARFCN_TEXT_LEN); - strncpy(higher_text, gsm_print_arfcn(index2arfcn(higher)), ARFCN_TEXT_LEN); + osmo_strlcpy(lower_text, gsm_print_arfcn(index2arfcn(lower)), ARFCN_TEXT_LEN); + osmo_strlcpy(higher_text, gsm_print_arfcn(index2arfcn(higher)), ARFCN_TEXT_LEN); LOGP(DCS, LOGL_INFO, "Use BA range: %s..%s\n", lower_text, higher_text); -- To view, visit https://gerrit.osmocom.org/10434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08f938cfb2589574e90d5831a00c0140f71d5bfe Gerrit-Change-Number: 10434 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 12:59:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 12:59:32 +0000 Subject: Change in osmocom-bb[master]: layer23: Use osmo_strlcpy() to avoid non-terminated strings In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10435 ) Change subject: layer23: Use osmo_strlcpy() to avoid non-terminated strings ...................................................................... layer23: Use osmo_strlcpy() to avoid non-terminated strings settings.c:191:2: warning: ?strncpy? output may be truncated copying 15 bytes from a string of length 15 -Wstringop-truncation] strncpy(set->imeisv, set->imei, 15); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC subscriber.o CC support.o CC transaction.o CC vty_interface.o CC voice.o CC mncc_sock.o CC primitives.o mncc_sock.c: In function ?osmo_unixsock_listen?: mncc_sock.c:318:2: warning: ?strncpy? specified bound 108 equals destination size [-Wstringop-truncation] strncpy(local.sun_path, path, sizeof(local.sun_path)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC script_lua.o vty_interface.c: In function ?cfg_gps_device?: vty_interface.c:1144:2: warning: ?strncpy? specified bound 32 equals destination size [-Wstringop-truncation] strncpy(g.device, argv[0], sizeof(g.device)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ AR libmobile.a Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1 --- M src/host/layer23/src/mobile/mncc_sock.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 7315927..39eb7bc 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -315,7 +315,7 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, path, sizeof(local.sun_path)); + osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)); local.sun_path[sizeof(local.sun_path) - 1] = '\0'; unlink(local.sun_path); diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 6a7cd81..7137761 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -189,7 +189,7 @@ sprintf(rand + 8, "%07d", layer23_random() % 10000000); strcpy(set->imei + 15 - digits, rand + 15 - digits); - strncpy(set->imeisv, set->imei, 15); + osmo_strlcpy(set->imeisv, set->imei, 15); return 0; } diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index ec1216f..4adcf90 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1141,7 +1141,7 @@ "GPS receiver\nSelect serial device\n" "Full path of serial device including /dev/") { - strncpy(g.device, argv[0], sizeof(g.device)); + osmo_strlcpy(g.device, argv[0], sizeof(g.device)); g.device[sizeof(g.device) - 1] = '\0'; g.gps_type = GPS_TYPE_SERIAL; if (g.enable) { -- To view, visit https://gerrit.osmocom.org/10435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id52978f3bf7a8abea62237d7c32f8f87e1bb34a1 Gerrit-Change-Number: 10435 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 14:08:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 14:08:59 +0000 Subject: Change in osmocom-bb[master]: layer23: Replace all instances of strncpy() by osmo_strlcpy In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10437 ) Change subject: layer23: Replace all instances of strncpy() by osmo_strlcpy ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/10437/2/src/host/layer23/src/common/l1l2_interface.c File src/host/layer23/src/common/l1l2_interface.c: https://gerrit.osmocom.org/#/c/10437/2/src/host/layer23/src/common/l1l2_interface.c at 118 PS2, Line 118: local.sun_path[sizeof(local.sun_path) - 1] = '\0'; this can go https://gerrit.osmocom.org/#/c/10437/2/src/host/layer23/src/common/sap_interface.c File src/host/layer23/src/common/sap_interface.c: https://gerrit.osmocom.org/#/c/10437/2/src/host/layer23/src/common/sap_interface.c at 512 PS2, Line 512: local.sun_path[sizeof(local.sun_path) - 1] = '\0'; this can go -- To view, visit https://gerrit.osmocom.org/10437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 Gerrit-Change-Number: 10437 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 11 Aug 2018 14:08:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 14:09:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 14:09:14 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix possible buffer overflow writing NUL beyond end of string In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10436 ) Change subject: layer23: Fix possible buffer overflow writing NUL beyond end of string ...................................................................... layer23: Fix possible buffer overflow writing NUL beyond end of string settings.c: In function ?gsm_random_imei?: settings.c:188:26: warning: ?sprintf? may write a terminating nul past the end of the destination [-Wformat-overflow=] sprintf(rand + 8, "%07ld", random() % 10000000); ^ settings.c:188:2: note: ?sprintf? output between 8 and 9 bytes into a destination of size 8 sprintf(rand + 8, "%07ld", random() % 10000000); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: Id949487111235cd4af5ff068f1dce2f4b0801480 --- M src/host/layer23/src/mobile/settings.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 7137761..a4bb4e3 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -178,7 +178,7 @@ int gsm_random_imei(struct gsm_settings *set) { int digits = set->imei_random; - char rand[16]; + char rand[16+1]; if (digits <= 0) return 0; -- To view, visit https://gerrit.osmocom.org/10436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id949487111235cd4af5ff068f1dce2f4b0801480 Gerrit-Change-Number: 10436 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 14:10:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 14:10:45 +0000 Subject: Change in osmocom-bb[master]: layer23: Replace all instances of strncpy() by osmo_strlcpy In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10437 to look at the new patch set (#3). Change subject: layer23: Replace all instances of strncpy() by osmo_strlcpy ...................................................................... layer23: Replace all instances of strncpy() by osmo_strlcpy This gives us working/safe zero termination without overflowing the destination string size. Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/subscriber.c M src/host/layer23/src/mobile/vty_interface.c 7 files changed, 15 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/10437/3 -- To view, visit https://gerrit.osmocom.org/10437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 Gerrit-Change-Number: 10437 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 11 14:11:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 14:11:27 +0000 Subject: Change in osmocom-bb[master]: layer23: Replace all instances of strncpy() by osmo_strlcpy In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10437 ) Change subject: layer23: Replace all instances of strncpy() by osmo_strlcpy ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 Gerrit-Change-Number: 10437 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 11 Aug 2018 14:11:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Aug 11 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 11 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#212?= In-Reply-To: <1567634219.150.1533913806327.JavaMail.jenkins@jenkins.osmocom.org> References: <1567634219.150.1533913806327.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1096005957.168.1534000206099.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Aug 11 18:37:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 11 Aug 2018 18:37:43 +0000 Subject: Change in osmocom-bb[master]: layer23: Replace all instances of strncpy() by osmo_strlcpy In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10437 ) Change subject: layer23: Replace all instances of strncpy() by osmo_strlcpy ...................................................................... layer23: Replace all instances of strncpy() by osmo_strlcpy This gives us working/safe zero termination without overflowing the destination string size. Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/subscriber.c M src/host/layer23/src/mobile/vty_interface.c 7 files changed, 15 insertions(+), 23 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index 956279d..3e9cee4 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -114,8 +114,7 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, socket_path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; + osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); rc = connect(ms->l2_wq.bfd.fd, (struct sockaddr *) &local, sizeof(local)); diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index fd19659..e18bb31 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -508,8 +508,7 @@ } local.sun_family = AF_UNIX; - strncpy(local.sun_path, socket_path, sizeof(local.sun_path)); - local.sun_path[sizeof(local.sun_path) - 1] = '\0'; + osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); rc = connect(ms->sap_wq.bfd.fd, (struct sockaddr *) &local, sizeof(local)); if (rc < 0) { @@ -572,7 +571,7 @@ { struct gsm_settings *set = &ms->settings; memset(set->sap_socket_path, 0, sizeof(set->sap_socket_path)); - strncpy(set->sap_socket_path, path, sizeof(set->sap_socket_path) - 1); + osmo_strlcpy(set->sap_socket_path, path, sizeof(set->sap_socket_path) - 1); return 0; } diff --git a/src/host/layer23/src/mobile/gsm411_sms.c b/src/host/layer23/src/mobile/gsm411_sms.c index 623ba53..c476ff4 100644 --- a/src/host/layer23/src/mobile/gsm411_sms.c +++ b/src/host/layer23/src/mobile/gsm411_sms.c @@ -104,7 +104,7 @@ if (!sms) return NULL; - strncpy(sms->text, text, sizeof(sms->text)-1); + OSMO_STRLCPY_ARRAY(sms->text, text); /* FIXME: don't use ID 1 static */ sms->reply_path_req = 0; @@ -112,7 +112,7 @@ sms->ud_hdr_ind = 0; sms->protocol_id = 0; /* implicit */ sms->data_coding_scheme = dcs; - strncpy(sms->address, receiver, sizeof(sms->address)-1); + OSMO_STRLCPY_ARRAY(sms->address, receiver); /* Generate user_data */ sms->user_data_len = gsm_7bit_encode_n(sms->user_data, sizeof(sms->user_data), sms->text, NULL); diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index ee2c943..2869ce6 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -200,8 +200,7 @@ if (response) { char text[256], *t = text, *s; - strncpy(text, response, sizeof(text) - 1); - text[sizeof(text) - 1] = '\0'; + OSMO_STRLCPY_ARRAY(text, response); while ((s = strchr(text, '\r'))) *s = '\n'; while ((s = strsep(&t, "\n"))) { @@ -655,9 +654,7 @@ /* register */ if (ss_code && to && to[0] == '*') { - strncpy(dest, to + 1, sizeof(dest) - 1); - dest[sizeof(dest) - 1] = '\0'; - dest[strlen(dest) - 1] = '\0'; + OSMO_STRLCPY_ARRAY(dest, to + 1); return gsm480_tx_cf(trans, GSM0480_MTYPE_REGISTER, GSM0480_OP_CODE_REGISTER_SS, ss_code, dest); } diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index b8c2558..9be9c8f 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -576,8 +576,7 @@ setup.called.type = 0; /* auto/unknown - prefix must be used */ setup.called.plan = 1; /* ISDN */ - strncpy(setup.called.number, number, - sizeof(setup.called.number) - 1); + OSMO_STRLCPY_ARRAY(setup.called.number, number); /* bearer capability (mandatory) */ mncc_set_bearer(ms, -1, &setup); @@ -808,7 +807,7 @@ } call->dtmf_index = 0; - strncpy(call->dtmf, dtmf, sizeof(call->dtmf) - 1); + OSMO_STRLCPY_ARRAY(call->dtmf, dtmf); return dtmf_statemachine(call, NULL); } diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 6a30148..7a01141 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -256,7 +256,7 @@ return -EINVAL; } - strncpy(subscr->imsi, imsi + 1, sizeof(subscr->imsi) - 1); + OSMO_STRLCPY_ARRAY(subscr->imsi, imsi + 1); LOGP(DMM, LOGL_INFO, "received IMSI %s from SIM\n", subscr->imsi); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 4adcf90..12c32a5 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1582,8 +1582,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - strncpy(set->layer2_socket_path, argv[0], - sizeof(set->layer2_socket_path) - 1); + OSMO_STRLCPY_ARRAY(set->layer2_socket_path, argv[0]); vty_restart(vty, ms); return CMD_SUCCESS; @@ -1596,8 +1595,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - strncpy(set->sap_socket_path, argv[0], - sizeof(set->sap_socket_path) - 1); + OSMO_STRLCPY_ARRAY(set->sap_socket_path, argv[0]); vty_restart(vty, ms); return CMD_SUCCESS; @@ -2134,10 +2132,10 @@ return CMD_WARNING; } llist_add_tail(&abbrev->list, &set->abbrev); - strncpy(abbrev->abbrev, argv[0], sizeof(abbrev->abbrev) - 1); - strncpy(abbrev->number, argv[1], sizeof(abbrev->number) - 1); + OSMO_STRLCPY_ARRAY(abbrev->abbrev, argv[0]); + OSMO_STRLCPY_ARRAY(abbrev->number, argv[1]); if (argc >= 3) - strncpy(abbrev->name, argv[2], sizeof(abbrev->name) - 1); + OSMO_STRLCPY_ARRAY(abbrev->name, argv[2]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ica6098ceba2bd01ce3b216085442cc5eed0ca507 Gerrit-Change-Number: 10437 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Aug 12 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 12 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#213?= In-Reply-To: <1096005957.168.1534000206099.JavaMail.jenkins@jenkins.osmocom.org> References: <1096005957.168.1534000206099.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <457111352.180.1534086606040.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Aug 13 07:43:57 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 13 Aug 2018 07:43:57 +0000 Subject: Change in osmo-bsc[master]: doc: update mgw settings in example config file In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10239 ) Change subject: doc: update mgw settings in example config file ...................................................................... Patch Set 1: > do we want this? This would make it impossible to run bsc + msc on > the same machine using the example configs, right? It shouldn't collide, the port in osmo-msc is 2728 and here in osmo-bsc it is 2727. -- To view, visit https://gerrit.osmocom.org/10239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b1c5097d98ec2ab97d51f99b1105db3de85c75f Gerrit-Change-Number: 10239 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 13 Aug 2018 07:43:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 07:51:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 07:51:56 +0000 Subject: Change in osmo-gsm-tester[master]: Cleanup of class scoped variables In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10413 ) Change subject: Cleanup of class scoped variables ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ad4cac34a9f49eaf42966c01c9c5a4d3f3e9dc8 Gerrit-Change-Number: 10413 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 13 Aug 2018 07:51:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 07:51:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 07:51:58 +0000 Subject: Change in osmo-gsm-tester[master]: Cleanup of class scoped variables In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10413 ) Change subject: Cleanup of class scoped variables ...................................................................... Cleanup of class scoped variables After bug described in OS#3456 and fixed in last commit, let's categorize and place variables in its correct plac to avoid similar issus. We leave under the class keyword (class scoped variables) the attributes which are to be used as static class attributes. All other ones are initialized during __init__(). This way w avoid scenarios in which while using an object from an instance attribute we end up reading a class scoped variable which is shared among all instances. Change-Id: I5ad4cac34a9f49eaf42966c01c9c5a4d3f3e9dc8 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/esme.py M src/osmo_gsm_tester/event_loop.py M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/osmo_bsc.py M src/osmo_gsm_tester/osmo_ggsn.py M src/osmo_gsm_tester/osmo_hlr.py M src/osmo_gsm_tester/osmo_mgcpgw.py M src/osmo_gsm_tester/osmo_mgw.py M src/osmo_gsm_tester/osmo_msc.py M src/osmo_gsm_tester/osmo_nitb.py M src/osmo_gsm_tester/osmo_sgsn.py M src/osmo_gsm_tester/osmo_stp.py M src/osmo_gsm_tester/osmocon.py M src/osmo_gsm_tester/pcu.py M src/osmo_gsm_tester/pcu_osmo.py M src/osmo_gsm_tester/pcu_sysmo.py M src/osmo_gsm_tester/process.py M src/osmo_gsm_tester/sms.py M src/osmo_gsm_tester/smsc.py M src/osmo_gsm_tester/suite.py M src/osmo_gsm_tester/test.py M src/osmo_gsm_tester/trial.py 27 files changed, 92 insertions(+), 145 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 0f3ef1c..041b2bc 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -25,24 +25,21 @@ from . import log, config, util, template, process, schema, pcu_osmo class Bts(log.Origin, metaclass=ABCMeta): - suite_run = None - conf = None - bsc = None - sgsn = None - lac = None - rac = None - cellid = None - bvci = None - defaults_cfg_name = None - _num_trx = 1 - _max_trx = None - overlay_trx_list = [] ############## # PROTECTED ############## def __init__(self, suite_run, conf, name, defaults_cfg_name): super().__init__(log.C_RUN, name) + self.bsc = None + self.sgsn = None + self.lac = None + self.rac = None + self.cellid = None + self.bvci = None + self._num_trx = 1 + self._max_trx = None + self.overlay_trx_list = [] self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index 318c30d..f1a0ce8 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -27,16 +27,14 @@ ############## # PROTECTED ############## - run_dir = None - inst = None - env = None BIN_BTS_OCTPHY = 'osmo-bts-octphy' - CONF_BTS_OCTPHY = 'osmo-bts-octphy.cfg' def __init__(self, suite_run, conf): super().__init__(suite_run, conf, OsmoBtsOctphy.BIN_BTS_OCTPHY, 'osmo_bts_octphy') + self.run_dir = None + self.inst = None self.env = {} self.values = {} diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index b9b7fef..32784bd 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -24,14 +24,14 @@ from . import log, config, util, template, process, bts, pcu_osmo class OsmoBts(bts.Bts, metaclass=ABCMeta): - proc_bts = None - _pcu = None ############## # PROTECTED ############## def __init__(self, suite_run, conf, name, defaults_cfg_name): super().__init__(suite_run, conf, name, defaults_cfg_name) + self._pcu = None + self.proc_bts = None if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) @@ -75,9 +75,9 @@ ############## # PROTECTED ############## - pcu_sk_tmp_dir = None def __init__(self, suite_run, conf, name, defaults_cfg_name): + self.pcu_sk_tmp_dir = None super().__init__(suite_run, conf, name, defaults_cfg_name) ######################## diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index b9310f8..1584eb2 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -27,10 +27,6 @@ ############## # PROTECTED ############## - run_dir = None - inst = None - env = None - trx = None BIN_BTS_TRX = 'osmo-bts-trx' BIN_PCU = 'osmo-pcu' @@ -39,6 +35,9 @@ def __init__(self, suite_run, conf): super().__init__(suite_run, conf, OsmoBtsTrx.BIN_BTS_TRX, 'osmo_bts_trx') + self.run_dir = None + self.inst = None + self.trx = None self.env = {} def trx_remote_ip(self): diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index 65c9279..e3f4823 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -25,10 +25,6 @@ ############## # PROTECTED ############## - run_dir = None - inst = None - remote_inst = None - remote_dir = None REMOTE_DIR = '/osmo-gsm-tester-bts' BTS_SYSMO_BIN = 'osmo-bts-sysmo' @@ -36,6 +32,10 @@ def __init__(self, suite_run, conf): super().__init__(suite_run, conf, SysmoBts.BTS_SYSMO_BIN, 'osmo_bts_sysmo') + self.run_dir = None + self.inst = None + self.remote_inst = None + self.remote_dir = None self.remote_user = 'root' def _direct_pcu_enabled(self): diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/esme.py index 78421f6..9653fbf 100644 --- a/src/osmo_gsm_tester/esme.py +++ b/src/osmo_gsm_tester/esme.py @@ -34,8 +34,6 @@ MAX_PASSWD_LEN = 16 class Esme(log.Origin): - client = None - smsc = None MSGMODE_TRANSACTION = smpplib.consts.SMPP_MSGMODE_FORWARD MSGMODE_STOREFORWARD = smpplib.consts.SMPP_MSGMODE_STOREFORWARD @@ -45,6 +43,8 @@ # Get last characters of msisdn to stay inside MAX_SYS_ID_LEN. Similar to modulus operator. self.set_system_id('esme-' + self.msisdn[-11:]) super().__init__(log.C_TST, self.system_id) + self.client = None + self.smsc = None self.set_password('esme-pwd') self.connected = False self.bound = False diff --git a/src/osmo_gsm_tester/event_loop.py b/src/osmo_gsm_tester/event_loop.py index 0f647c2..fe88ef4 100644 --- a/src/osmo_gsm_tester/event_loop.py +++ b/src/osmo_gsm_tester/event_loop.py @@ -23,10 +23,12 @@ from . import log class DeferredHandling: - defer_queue = [] + + def __init__(self): + self.defer_queue = [] def handle_queue(self): - while DeferredHandling.defer_queue: + while self.defer_queue: handler, args, kwargs = self.defer_queue.pop(0) handler(*args, **kwargs) @@ -34,10 +36,10 @@ self.defer_queue.append((handler, args, kwargs)) class WaitRequest: - timeout_ack = False - condition_ack = False def __init__(self, condition, condition_args, condition_kwargs, timeout, timestep): + self.timeout_ack = False + self.condition_ack = False self.timeout_started = time.time() self.timeout = timeout self.condition = condition @@ -53,12 +55,9 @@ self.timeout_ack = True class EventLoop: - poll_funcs = [] - gloop = None - gctx = None - deferred_handling = None def __init__(self): + self.poll_funcs = [] self.gloop = GLib.MainLoop() self.gctx = self.gloop.get_context() self.deferred_handling = DeferredHandling() diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index 59fcc76..d0bbf23 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -321,10 +321,6 @@ class Modem(log.Origin): 'convenience for ofono Modem interaction' - msisdn = None - sms_received_list = None - _ki = None - _imsi = None CTX_PROT_IPv4 = 'ip' CTX_PROT_IPv6 = 'ipv6' @@ -336,6 +332,9 @@ self.dbuspath = get_dbuspath_from_syspath(self.syspath) super().__init__(log.C_TST, self.dbuspath) self.dbg('creating from syspath %s', self.syspath) + self.msisdn = None + self._ki = None + self._imsi = None self.sms_received_list = [] self.dbus = ModemDbusInteraction(self.dbuspath) self.register_attempts = 0 diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py index 323b9ec..0e5bbbe 100644 --- a/src/osmo_gsm_tester/osmo_bsc.py +++ b/src/osmo_gsm_tester/osmo_bsc.py @@ -24,19 +24,14 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoBsc(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - bts = None - encryption = None - rsl_ip = None - mgw = None - stp = None def __init__(self, suite_run, msc, mgw, stp, ip_address): super().__init__(log.C_RUN, 'osmo-bsc_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.encryption = None + self.rsl_ip = None self.suite_run = suite_run self.ip_address = ip_address self.bts = [] diff --git a/src/osmo_gsm_tester/osmo_ggsn.py b/src/osmo_gsm_tester/osmo_ggsn.py index 9f23c64..2fdc792 100644 --- a/src/osmo_gsm_tester/osmo_ggsn.py +++ b/src/osmo_gsm_tester/osmo_ggsn.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoGgsn(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-ggsn_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address diff --git a/src/osmo_gsm_tester/osmo_hlr.py b/src/osmo_gsm_tester/osmo_hlr.py index 635f711..a4633e3 100644 --- a/src/osmo_gsm_tester/osmo_hlr.py +++ b/src/osmo_gsm_tester/osmo_hlr.py @@ -25,8 +25,6 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoHlr(log.Origin): - suite_run = None - ip_address = None run_dir = None config_file = None process = None @@ -34,9 +32,12 @@ def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-hlr_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.next_subscriber_id = 1 self.suite_run = suite_run self.ip_address = ip_address - self.bts = [] def start(self): self.log('Starting osmo-hlr') diff --git a/src/osmo_gsm_tester/osmo_mgcpgw.py b/src/osmo_gsm_tester/osmo_mgcpgw.py index bebb9d5..82b9149 100644 --- a/src/osmo_gsm_tester/osmo_mgcpgw.py +++ b/src/osmo_gsm_tester/osmo_mgcpgw.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoMgcpgw(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address, bts_ip): super().__init__(log.C_RUN, 'osmo-mgcpgw_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address # hack: so far mgcpgw needs one specific BTS IP. diff --git a/src/osmo_gsm_tester/osmo_mgw.py b/src/osmo_gsm_tester/osmo_mgw.py index abac4aa..1d5596e 100644 --- a/src/osmo_gsm_tester/osmo_mgw.py +++ b/src/osmo_gsm_tester/osmo_mgw.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoMgw(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-mgw_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/osmo_msc.py index 0e458fe..192926c 100644 --- a/src/osmo_gsm_tester/osmo_msc.py +++ b/src/osmo_gsm_tester/osmo_msc.py @@ -23,20 +23,15 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc class OsmoMsc(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - hlr = None - config = None - smsc = None - stp = None - encryption = None - authentication = None def __init__(self, suite_run, hlr, mgw, stp, ip_address): super().__init__(log.C_RUN, 'osmo-msc_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.config = None + self.encryption = None + self.authentication = None self.suite_run = suite_run self.ip_address = ip_address self.hlr = hlr diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/osmo_nitb.py index 48037a6..66ab2a6 100644 --- a/src/osmo_gsm_tester/osmo_nitb.py +++ b/src/osmo_gsm_tester/osmo_nitb.py @@ -24,17 +24,13 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc class OsmoNitb(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - bts = None - smsc = None - encryption = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-nitb_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.encryption = None self.suite_run = suite_run self.ip_address = ip_address self.bts = [] diff --git a/src/osmo_gsm_tester/osmo_sgsn.py b/src/osmo_gsm_tester/osmo_sgsn.py index 8659186..07cf059 100644 --- a/src/osmo_gsm_tester/osmo_sgsn.py +++ b/src/osmo_gsm_tester/osmo_sgsn.py @@ -23,16 +23,12 @@ from . import log, util, config, template, process, osmo_ctrl, pcap_recorder class OsmoSgsn(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None - hlr = None - ggsn = None def __init__(self, suite_run, hlr, ggsn, ip_address): super().__init__(log.C_RUN, 'osmo-sgsn_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.hlr = hlr self.ggsn = ggsn diff --git a/src/osmo_gsm_tester/osmo_stp.py b/src/osmo_gsm_tester/osmo_stp.py index ced138b..5a7f0d3 100644 --- a/src/osmo_gsm_tester/osmo_stp.py +++ b/src/osmo_gsm_tester/osmo_stp.py @@ -23,14 +23,12 @@ from . import log, util, config, template, process, pcap_recorder class OsmoStp(log.Origin): - suite_run = None - ip_address = None - run_dir = None - config_file = None - process = None def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'osmo-stp_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None self.suite_run = suite_run self.ip_address = ip_address diff --git a/src/osmo_gsm_tester/osmocon.py b/src/osmo_gsm_tester/osmocon.py index 5b1e145..8b6040f 100644 --- a/src/osmo_gsm_tester/osmocon.py +++ b/src/osmo_gsm_tester/osmocon.py @@ -24,10 +24,6 @@ from .event_loop import MainLoop class Osmocon(log.Origin): - suite_run = None - run_dir = None - process = None - sk_tmp_dir = None FIRMWARE_FILE="opt/osmocom-bb/target/firmware/board/compal_e88/layer1.compalram.bin" @@ -37,6 +33,8 @@ raise log.Error('osmocon_phone contains no attr "serial_device"') self.serial_device = os.path.realpath(serial_device) super().__init__(log.C_RUN, 'osmocon_%s' % os.path.basename(self.serial_device)) + self.run_dir = None + self.process = None self.suite_run = suite_run self.conf = conf self.sk_tmp_dir = tempfile.mkdtemp('', 'ogtosmoconsk') diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py index 0260296..9ec8f35 100644 --- a/src/osmo_gsm_tester/pcu.py +++ b/src/osmo_gsm_tester/pcu.py @@ -22,9 +22,6 @@ class Pcu(log.Origin, metaclass=ABCMeta): """PCU Abstract Base Class.""" - suite_run = None - run_dir = None - bts = None ############## # PROTECTED diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py index 50ae134..ad8ebce 100644 --- a/src/osmo_gsm_tester/pcu_osmo.py +++ b/src/osmo_gsm_tester/pcu_osmo.py @@ -23,14 +23,14 @@ from . import log, config, util, template, process, pcu class OsmoPcu(pcu.Pcu): - inst = None - env = None BIN_PCU = 'osmo-pcu' PCU_OSMO_CFG = 'osmo-pcu.cfg' def __init__(self, suite_run, bts, conf): super().__init__(suite_run, bts, conf, OsmoPcu.BIN_PCU) + self.run_dir = None + self.inst = None self.conf = conf self.env = {} diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py index b97852a..cd3b75e 100644 --- a/src/osmo_gsm_tester/pcu_sysmo.py +++ b/src/osmo_gsm_tester/pcu_sysmo.py @@ -22,14 +22,6 @@ from . import log, config, util, template, process class OsmoPcuSysmo(log.Origin): - suite_run = None - bsc = None - run_dir = None - inst = None - remote_inst = None - remote_env = None - remote_dir = None - sysmobts = None REMOTE_DIR = '/osmo-gsm-tester-pcu' PCU_SYSMO_BIN = 'osmo-pcu' @@ -37,6 +29,12 @@ def __init__(self, suite_run, sysmobts, conf): super().__init__(log.C_RUN, self.PCU_SYSMO_BIN) + self.run_dir = None + self.bsc = None + self.inst = None + self.remote_inst = None + self.remote_dir = None + self.sysmobts = None self.suite_run = suite_run self.sysmobts = sysmobts self.conf = conf diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index c13ded0..ad2405d 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -29,13 +29,11 @@ class Process(log.Origin): - process_obj = None - outputs = None - result = None - killed = None - def __init__(self, name, run_dir, popen_args, **popen_kwargs): super().__init__(log.C_RUN, name) + self.process_obj = None + self.result = None + self.killed = None self.name_str = name self.run_dir = run_dir self.popen_args = popen_args diff --git a/src/osmo_gsm_tester/sms.py b/src/osmo_gsm_tester/sms.py index e264b66..0118517 100644 --- a/src/osmo_gsm_tester/sms.py +++ b/src/osmo_gsm_tester/sms.py @@ -19,7 +19,6 @@ class Sms: _last_sms_idx = 0 - msg = None def __init__(self, src_msisdn=None, dst_msisdn=None, *tokens): Sms._last_sms_idx += 1 diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/smsc.py index 4837f37..1a0859c 100644 --- a/src/osmo_gsm_tester/smsc.py +++ b/src/osmo_gsm_tester/smsc.py @@ -20,7 +20,6 @@ from . import log, config, util, template, process class Smsc: - esmes = None SMSC_POLICY_CLOSED = 'closed' SMSC_POLICY_ACCEPT_ALL = 'accept-all' diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index db4a8dc..c712a75 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -63,21 +63,17 @@ PASS = 'PASS' FAIL = 'FAIL' - trial = None - status = None - start_timestamp = None - duration = None - resources_pool = None - reserved_resources = None - objects_to_clean_up = None - test_import_modules_to_clean_up = [] - _resource_requirements = None - _config = None - _processes = None - _run_dir = None - def __init__(self, trial, suite_scenario_str, suite_definition, scenarios=[]): super().__init__(log.C_TST, suite_scenario_str) + self.start_timestamp = None + self.duration = None + self.reserved_resources = None + self.objects_to_clean_up = None + self.test_import_modules_to_clean_up = [] + self._resource_requirements = None + self._config = None + self._processes = None + self._run_dir = None self.trial = trial self.definition = suite_definition self.scenarios = scenarios diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py index b706dac..6f141f1 100644 --- a/src/osmo_gsm_tester/test.py +++ b/src/osmo_gsm_tester/test.py @@ -31,11 +31,10 @@ PASS = 'pass' FAIL = 'FAIL' - _run_dir = None - def __init__(self, suite_run, test_basename): self.basename = test_basename super().__init__(log.C_TST, self.basename) + self._run_dir = None self.suite_run = suite_run self.path = os.path.join(self.suite_run.definition.suite_dir, self.basename) self.status = Test.UNKNOWN diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/trial.py index d54e96c..149d34c 100644 --- a/src/osmo_gsm_tester/trial.py +++ b/src/osmo_gsm_tester/trial.py @@ -36,12 +36,6 @@ PASS = 'PASS' FAIL = 'FAIL' - path = None - dir = None - _run_dir = None - bin_tars = None - log_targets = None - @staticmethod def next(trials_dir): @@ -63,6 +57,8 @@ self.bin_tars = [] self.suites = [] self.status = Trial.UNKNOWN + self._run_dir = None + self.log_targets = None def __repr__(self): return self.name() -- To view, visit https://gerrit.osmocom.org/10413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5ad4cac34a9f49eaf42966c01c9c5a4d3f3e9dc8 Gerrit-Change-Number: 10413 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 11 20:08:03 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Aug 2018 20:08:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx-debian8-jessie in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b713bfa5aed4_6c2a4f8684966b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx-debian8-jessie/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-trx-debian8-jessie failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx-debian8-jessie Last lines of build log: [ 337s] dpkg-source --after-build BUILD [ 337s] dpkg-buildpackage: info: full upload; Debian-native package (full source is included) [ 337s] Warning: mkbaselibs missing in build root, skipping baselibs [ 337s] ... saving statistics [ 337s] ... saving built packages [ 337s] DEBS/osmo-trx_0.4.0_armhf.changes [ 337s] DEBS/osmo-trx_0.4.0.tar.xz [ 337s] DEBS/osmo-trx_0.4.0_all.deb [ 337s] DEBS/osmo-trx_0.4.0.dsc [ 337s] DEBS/osmo-trx-dbg_0.4.0_armhf.deb [ 337s] DEBS/osmo-trx-usrp1_0.4.0_armhf.deb [ 337s] DEBS/osmo-trx-uhd_0.4.0_armhf.deb [ 337s] OTHER/_statistics [ 337s] [ 337s] armbuild04 finished "build osmo-trx_0.4.0.dsc" at Sun Aug 12 20:11:13 UTC 2018. [ 337s] [ 337s] ### VM INTERACTION START ### [ 340s] [ 317.516397] SysRq : Power Off [ 340s] [ 317.518352] reboot: Power down [ 340s] ### VM INTERACTION END ### [ 340s] build: extracting built packages... [ 340s] DEBS/osmo-trx_0.4.0_armhf.changes [ 340s] DEBS/osmo-trx_0.4.0.tar.xz [ 340s] DEBS/osmo-trx_0.4.0_all.deb [ 340s] DEBS/osmo-trx_0.4.0.dsc [ 340s] DEBS/osmo-trx-dbg_0.4.0_armhf.deb [ 340s] DEBS/osmo-trx-usrp1_0.4.0_armhf.deb [ 340s] DEBS/osmo-trx-uhd_0.4.0_armhf.deb [ 340s] OTHER/_statistics -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 11 20:08:03 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 11 Aug 2018 20:08:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx-debian8-jessie in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b713bf9cf4c2_6c2a4f868496593@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx-debian8-jessie/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-trx-debian8-jessie failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx-debian8-jessie Last lines of build log: [ 337s] dpkg-source --after-build BUILD [ 337s] dpkg-buildpackage: info: full upload; Debian-native package (full source is included) [ 337s] Warning: mkbaselibs missing in build root, skipping baselibs [ 337s] ... saving statistics [ 337s] ... saving built packages [ 337s] DEBS/osmo-trx_0.4.0_armhf.changes [ 337s] DEBS/osmo-trx_0.4.0.tar.xz [ 337s] DEBS/osmo-trx_0.4.0_all.deb [ 337s] DEBS/osmo-trx_0.4.0.dsc [ 337s] DEBS/osmo-trx-dbg_0.4.0_armhf.deb [ 337s] DEBS/osmo-trx-usrp1_0.4.0_armhf.deb [ 337s] DEBS/osmo-trx-uhd_0.4.0_armhf.deb [ 337s] OTHER/_statistics [ 337s] [ 337s] armbuild04 finished "build osmo-trx_0.4.0.dsc" at Sun Aug 12 20:11:13 UTC 2018. [ 337s] [ 337s] ### VM INTERACTION START ### [ 340s] [ 317.516397] SysRq : Power Off [ 340s] [ 317.518352] reboot: Power down [ 340s] ### VM INTERACTION END ### [ 340s] build: extracting built packages... [ 340s] DEBS/osmo-trx_0.4.0_armhf.changes [ 340s] DEBS/osmo-trx_0.4.0.tar.xz [ 340s] DEBS/osmo-trx_0.4.0_all.deb [ 340s] DEBS/osmo-trx_0.4.0.dsc [ 340s] DEBS/osmo-trx-dbg_0.4.0_armhf.deb [ 340s] DEBS/osmo-trx-usrp1_0.4.0_armhf.deb [ 340s] DEBS/osmo-trx-uhd_0.4.0_armhf.deb [ 340s] OTHER/_statistics -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 13 08:34:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 08:34:25 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10438 Change subject: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# ...................................................................... osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# Since osmo-hlr.git I1d09fab810a6bb9ab02904de72dbc9e8a414f9f9, USSD processing has been moved to osmo-ghlr and prfix routing needs to be configured, otherwise USSD requested are answered back to the MS with an error "ss-NotAvailable (18)". Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d --- M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/38/10438/1 diff --git a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl index ccb8224..014efd3 100644 --- a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl @@ -13,3 +13,4 @@ hlr gsup bind ip ${hlr.ip_address.addr} + ussd route prefix *#100# internal own-msisdn -- To view, visit https://gerrit.osmocom.org/10438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d Gerrit-Change-Number: 10438 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 09:00:19 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 13 Aug 2018 09:00:19 +0000 Subject: Change in osmocom-bb[master]: WIP: Allow lua code to register a fd for reading with the runtime Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10439 Change subject: WIP: Allow lua code to register a fd for reading with the runtime ...................................................................... WIP: Allow lua code to register a fd for reading with the runtime To have bi-directional communication we can pass credentials to the registry server and now we can register a callback when the registry is sending data to us. Change-Id: I8254bdda1df2f8fe0a5eac894b931e7de5b426df --- M src/host/layer23/src/mobile/script_lua.c 1 file changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/10439/1 diff --git a/src/host/layer23/src/mobile/script_lua.c b/src/host/layer23/src/mobile/script_lua.c index 4cfe55a..1cfa812 100644 --- a/src/host/layer23/src/mobile/script_lua.c +++ b/src/host/layer23/src/mobile/script_lua.c @@ -28,6 +28,7 @@ #include +#include #include #include @@ -37,6 +38,12 @@ int cb_ref; }; +struct fd_userdata { + struct lua_State *state; + struct osmo_fd fd; + int cb_ref; +}; + static char lua_prim_key[] = "osmocom.org-mobile-prim"; static struct mobile_prim_intf *get_primitive(lua_State *L) @@ -430,6 +437,93 @@ return 1; } +static int lua_fd_cb(struct osmo_fd *fd, unsigned int what) { + struct fd_userdata *fdu; + lua_State *L; + int cb_ref; + int err; + + if (!fd->data) { + LOGP(DLUA, LOGL_ERROR, + "fd callback for fd(%d) but no lua callback\n", fd->fd); + return 0; + } + + fdu = fd->data; + L = fdu->state; + cb_ref = fdu->cb_ref; + lua_rawgeti(L, LUA_REGISTRYINDEX, cb_ref); + luaL_unref(L, LUA_REGISTRYINDEX, cb_ref); + + lua_pushinteger(L, fd->fd); + + err = lua_pcall(L, 1, 0, 0); + if (err) { + LOGP(DLUA, LOGL_ERROR, "lua error: %s\n", lua_tostring(L, -1)); + lua_pop(L, 1); + } + + return 0; +} + +/* Register the fd */ +static int lua_register_fd(lua_State *L) +{ + struct fd_userdata *fdu; + + /* fd, cb */ + luaL_argcheck(L, lua_isnumber(L, -2), 1, "needs to be a filedescriptor"); + luaL_argcheck(L, lua_isfunction(L, -1), 2, "Callback needs to be a function"); + + /* Cretae a table so a user can unregister (and unregister on GC) */ + fdu = lua_newuserdata(L, sizeof(*fdu)); + fdu->state = L; + fdu->fd.fd = -1; + luaL_getmetatable(L, "Fd"); + lua_setmetatable(L, -2); + + /* Set the filedescriptor */ + fdu->fd.fd = (int) lua_tonumber(L, -3); + fdu->fd.cb = lua_fd_cb; + fdu->fd.when = BSC_FD_READ; + fdu->fd.data = fdu; + + /* Assuming that an error here will lead to a GC */ + if (osmo_fd_register(&fdu->fd) != 0) { + fdu->cb_ref = LUA_NOREF; + lua_pushliteral(L, "Can't register the fd"); + lua_error(L); + return 0; + } + + /* Take the callback and keep a reference to it */ + lua_pushvalue(L, -2); + fdu->cb_ref = luaL_ref(L, LUA_REGISTRYINDEX); + + return 1; +} + +static int lua_fd_unregister(lua_State *L) { + struct fd_userdata *fdu; + + luaL_argcheck(L, lua_isuserdata(L, -1), 1, "No userdata"); + fdu = lua_touserdata(L, -1); + + /* Unregister the fd and forget about the callback */ + osmo_fd_unregister(&fdu->fd); + if (fdu->cb_ref != LUA_NOREF) { + luaL_unref(L, LUA_REGISTRYINDEX, fdu->cb_ref); + fdu->cb_ref = LUA_NOREF; + } + return 0; +} + + +static const struct luaL_Reg fd_funcs[] = { + { "unregister", lua_fd_unregister }, + { "__gc", lua_fd_unregister }, +}; + static const struct luaL_Reg ms_funcs[] = { { "imsi", lua_ms_imsi }, { "imei", lua_ms_imei }, @@ -447,6 +541,7 @@ static const struct luaL_Reg osmo_funcs[] = { { "timeout", lua_osmo_timeout }, { "unix_passcred", lua_unix_passcred }, + { "register_fd", lua_register_fd }, { "ms", lua_osmo_ms }, { NULL, NULL }, }; @@ -510,6 +605,7 @@ /* Create metatables so we can GC objects... */ create_meta_table(L, "Timer", timer_funcs); create_meta_table(L, "MS", ms_funcs); + create_meta_table(L, "Fd", fd_funcs); /* Remember the primitive pointer... store it in the registry */ lua_pushlightuserdata(L, lua_prim_key); -- To view, visit https://gerrit.osmocom.org/10439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8254bdda1df2f8fe0a5eac894b931e7de5b426df Gerrit-Change-Number: 10439 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 10:09:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 10:09:04 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10438 ) Change subject: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d Gerrit-Change-Number: 10438 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Aug 2018 10:09:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 10:10:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 10:10:02 +0000 Subject: Change in osmo-bsc[master]: lcls: do not LCLS call legs with different codecs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9940 ) Change subject: lcls: do not LCLS call legs with different codecs ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I157549129a40c64364dc126f67195759e5f1d60f Gerrit-Change-Number: 9940 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 13 Aug 2018 10:10:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 10:10:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 10:10:04 +0000 Subject: Change in osmo-bsc[master]: lcls: do not LCLS call legs with different codecs In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9940 ) Change subject: lcls: do not LCLS call legs with different codecs ...................................................................... lcls: do not LCLS call legs with different codecs It is theoretically possible to LCLS two legs that use different codecs. However, this requires transcoding capabilities on the local MGW. If the local MGW lacks transcoding features such a local circuit should be avoided. Enabeling LCLS under such coditions should be optional (VTY) - Add check to avoid LCLS on different codec/rate - Add VTY-Option to optionally override the check (MGW is able to transcode) Change-Id: I157549129a40c64364dc126f67195759e5f1d60f Related: OS#1602 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/osmo_bsc_lcls.c M src/osmo-bsc/osmo_bsc_vty.c 3 files changed, 36 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 79d2eca..7ec3442 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -87,6 +87,7 @@ struct gsm_audio_support **audio_support; int audio_length; enum bsc_lcls_mode lcls_mode; + bool lcls_codec_mismatch_allow; /* ussd welcome text */ char *ussd_welcome_txt; diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 4639c4e..6aeccb3 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -274,6 +274,18 @@ return false; } + if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate + && conn->sccp.msc->lcls_codec_mismatch_allow == false) { + LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel rate)\n"); + return false; + } + + if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode + && conn->sccp.msc->lcls_codec_mismatch_allow == false) { + LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch (channel mode)\n"); + return false; + } + return true; } diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index f6f1b8a..efa12e0 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -184,6 +184,11 @@ vty_out(vty, " lcls-mode %s%s", get_value_string(bsc_lcls_mode_names, msc->lcls_mode), VTY_NEWLINE); + if (msc->lcls_codec_mismatch_allow) + vty_out(vty, " lcls-codec-mismatch allowed%s", VTY_NEWLINE); + else + vty_out(vty, " lcls-codec-mismatch forbidden%s", VTY_NEWLINE); + /* write MGW configuration */ mgcp_client_config_write(vty, " "); } @@ -650,6 +655,23 @@ return CMD_SUCCESS; } +DEFUN(cfg_net_msc_lcls_mismtch, + cfg_net_msc_lcls_mismtch_cmd, + "lcls-codec-mismatch (allowed|forbidden)", + "Allow 3GPP LCLS (Local Call, Local Switch) when call legs use different codec/rate\n" + "Allow LCLS only only for calls that use the same codec/rate on both legs\n" + "Do not Allow LCLS for calls that use a different codec/rate on both legs\n") +{ + struct bsc_msc_data *data = bsc_msc_data(vty); + + if (strcmp(argv[0], "allowed") == 0) + data->lcls_codec_mismatch_allow = true; + else + data->lcls_codec_mismatch_allow = false; + + return CMD_SUCCESS; +} + DEFUN(cfg_net_bsc_mid_call_text, cfg_net_bsc_mid_call_text_cmd, "mid-call-text .TEXT", @@ -938,6 +960,7 @@ install_element(MSC_NODE, &cfg_net_msc_amr_5_15_cmd); install_element(MSC_NODE, &cfg_net_msc_amr_4_75_cmd); install_element(MSC_NODE, &cfg_net_msc_lcls_mode_cmd); + install_element(MSC_NODE, &cfg_net_msc_lcls_mismtch_cmd); install_element(MSC_NODE, &cfg_msc_acc_lst_name_cmd); install_element(MSC_NODE, &cfg_msc_no_acc_lst_name_cmd); install_element(MSC_NODE, &cfg_msc_cs7_bsc_addr_cmd); -- To view, visit https://gerrit.osmocom.org/9940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I157549129a40c64364dc126f67195759e5f1d60f Gerrit-Change-Number: 9940 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 10:10:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 10:10:16 +0000 Subject: Change in osmo-bsc[master]: doc: update mgw settings in example config file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10239 ) Change subject: doc: update mgw settings in example config file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b1c5097d98ec2ab97d51f99b1105db3de85c75f Gerrit-Change-Number: 10239 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 13 Aug 2018 10:10:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 10:10:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 10:10:17 +0000 Subject: Change in osmo-bsc[master]: doc: update mgw settings in example config file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10239 ) Change subject: doc: update mgw settings in example config file ...................................................................... doc: update mgw settings in example config file The example config file lacks a default port setting for the local mgcp client port. Lets update that. Change-Id: I6b1c5097d98ec2ab97d51f99b1105db3de85c75f Related: OS#2874 --- M doc/examples/osmo-bsc/osmo-bsc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index a5ff1ea..a1bc7e3 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -93,6 +93,7 @@ amr-config 4_75k forbidden mgw remote-ip 127.0.0.1 mgw remote-port 2427 + mgw local-port 2727 mgw endpoint-range 1 31 bsc mid-call-timeout 0 -- To view, visit https://gerrit.osmocom.org/10239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6b1c5097d98ec2ab97d51f99b1105db3de85c75f Gerrit-Change-Number: 10239 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 12:38:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 12:38:11 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expecte... In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10438 to look at the new patch set (#2). Change subject: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expected answer format ...................................................................... osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expected answer format Since osmo-hlr.git I1d09fab810a6bb9ab02904de72dbc9e8a414f9f9, USSD processing has been moved to osmo-hlr and prefix routing needs to be configured, otherwise USSD requested are answered back to the MS with an error "ss-NotAvailable (18)". mesage received for extension resolution (*#100#) had its format change, so update to new format (carriage return at the end was dropped). Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d --- M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl M suites/aoip_ussd/assert_extension.py 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/38/10438/2 -- To view, visit https://gerrit.osmocom.org/10438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d Gerrit-Change-Number: 10438 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 12:53:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 12:53:29 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expecte... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10438 ) Change subject: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expected answer format ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d Gerrit-Change-Number: 10438 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Aug 2018 12:53:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 13:55:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 13:55:05 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expecte... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10438 ) Change subject: osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expected answer format ...................................................................... osmo-hlr.cfg.tmpl: Add ussd routing prefix for *#100# and fix expected answer format Since osmo-hlr.git I1d09fab810a6bb9ab02904de72dbc9e8a414f9f9, USSD processing has been moved to osmo-hlr and prefix routing needs to be configured, otherwise USSD requested are answered back to the MS with an error "ss-NotAvailable (18)". mesage received for extension resolution (*#100#) had its format change, so update to new format (carriage return at the end was dropped). Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d --- M src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl M suites/aoip_ussd/assert_extension.py 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl index ccb8224..014efd3 100644 --- a/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-hlr.cfg.tmpl @@ -13,3 +13,4 @@ hlr gsup bind ip ${hlr.ip_address.addr} + ussd route prefix *#100# internal own-msisdn diff --git a/suites/aoip_ussd/assert_extension.py b/suites/aoip_ussd/assert_extension.py index 56d853b..475de09 100755 --- a/suites/aoip_ussd/assert_extension.py +++ b/suites/aoip_ussd/assert_extension.py @@ -46,4 +46,5 @@ print('Sending ussd code %s' % USSD_COMMAND_GET_EXTENSION) response = ms.ussd_send(USSD_COMMAND_GET_EXTENSION) -assert ' ' + ms.msisdn + '\r' in response +log('got ussd response: %r' % repr(response)) +assert response.endswith(' ' + ms.msisdn) -- To view, visit https://gerrit.osmocom.org/10438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5f75eff0df2d20d7f9b39e69184cffb0e635713d Gerrit-Change-Number: 10438 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 14:09:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 14:09:27 +0000 Subject: Change in libosmo-netif[master]: jibuf: fix indentation in line inside conditional clause Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10440 Change subject: jibuf: fix indentation in line inside conditional clause ...................................................................... jibuf: fix indentation in line inside conditional clause Change-Id: I3cb356a4a13d53e7f88a5e4595899bb2eb510d20 --- M src/jibuf.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/40/10440/1 diff --git a/src/jibuf.c b/src/jibuf.c index 2632a57..502f6e5 100644 --- a/src/jibuf.c +++ b/src/jibuf.c @@ -322,7 +322,7 @@ struct msgb *msg, *tmp; osmo_timer_del(&jb->timer); llist_for_each_entry_safe(msg, tmp, &jb->msg_list, list) - dequeue_msg(jb, msg); + dequeue_msg(jb, msg); talloc_free(jb); } -- To view, visit https://gerrit.osmocom.org/10440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3cb356a4a13d53e7f88a5e4595899bb2eb510d20 Gerrit-Change-Number: 10440 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 14:47:35 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 14:47:35 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10370 to look at the new patch set (#4). Change subject: vty: add cmd "reset sgsn state" ...................................................................... vty: add cmd "reset sgsn state" Reset the SGSN internal state. Useful when testing the SGSN via TTCN3. Depends on the libosmocore commit: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 --- M src/gprs/sgsn_vty.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/70/10370/4 -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 14:56:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 14:56:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10376 ) Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... Patch Set 7: Code-Review-1 need further testing -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 13 Aug 2018 14:56:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Aug 13 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 13 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#214?= In-Reply-To: <457111352.180.1534086606040.JavaMail.jenkins@jenkins.osmocom.org> References: <457111352.180.1534086606040.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2106734407.193.1534173006096.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Aug 13 15:38:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 15:38:17 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10370 ) Change subject: vty: add cmd "reset sgsn state" ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 13 Aug 2018 15:38:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 15:38:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 15:38:35 +0000 Subject: Change in libosmo-netif[master]: jibuf: fix indentation in line inside conditional clause In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10440 ) Change subject: jibuf: fix indentation in line inside conditional clause ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cb356a4a13d53e7f88a5e4595899bb2eb510d20 Gerrit-Change-Number: 10440 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Aug 2018 15:38:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 15:38:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 15:38:37 +0000 Subject: Change in libosmo-netif[master]: jibuf: fix indentation in line inside conditional clause In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10440 ) Change subject: jibuf: fix indentation in line inside conditional clause ...................................................................... jibuf: fix indentation in line inside conditional clause Change-Id: I3cb356a4a13d53e7f88a5e4595899bb2eb510d20 --- M src/jibuf.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/jibuf.c b/src/jibuf.c index 2632a57..502f6e5 100644 --- a/src/jibuf.c +++ b/src/jibuf.c @@ -322,7 +322,7 @@ struct msgb *msg, *tmp; osmo_timer_del(&jb->timer); llist_for_each_entry_safe(msg, tmp, &jb->msg_list, list) - dequeue_msg(jb, msg); + dequeue_msg(jb, msg); talloc_free(jb); } -- To view, visit https://gerrit.osmocom.org/10440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3cb356a4a13d53e7f88a5e4595899bb2eb510d20 Gerrit-Change-Number: 10440 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 15:49:20 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 15:49:20 +0000 Subject: Change in docker-playground[master]: SGSN_Tests: fix module parameters Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10441 Change subject: SGSN_Tests: fix module parameters ...................................................................... SGSN_Tests: fix module parameters ttcn commit I9128f9ad5c372779c38799269393137ba52576cd moves the modules parameters from NS_Emulation to SGSN_Tests. Change-Id: I8d46c37b9c932582fe94e670d9347209bb599192 --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/10441/1 diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index ea193ef..92ed77b 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -12,8 +12,10 @@ *.SGSNVTY.CTRL_HOSTNAME := "172.18.8.10" [MODULE_PARAMETERS] -NS_Emulation.mp_local_ip := "172.18.8.103" -NS_Emulation.mp_remote_ip := "172.18.8.10" +SGSN_Tests.mp_nsconfig := { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" +} SGSN_Tests.mp_hlr_ip := "172.18.8.103" SGSN_Tests.mp_ggsn_ip := "172.18.8.103" -- To view, visit https://gerrit.osmocom.org/10441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8d46c37b9c932582fe94e670d9347209bb599192 Gerrit-Change-Number: 10441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 15:53:52 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 15:53:52 +0000 Subject: Change in osmo-sgsn[master]: vty: add cmd "reset sgsn state" In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/10370 ) Change subject: vty: add cmd "reset sgsn state" ...................................................................... vty: add cmd "reset sgsn state" Reset the SGSN internal state. Useful when testing the SGSN via TTCN3. Depends on the libosmocore commit: I29b6ad6742ddf9b0b58b4af37d9a1cf18e019325 Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 --- M src/gprs/sgsn_vty.c 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 8092158..057be9f 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,8 @@ #include #include +#include + #include #include @@ -796,6 +799,34 @@ vty_out(vty, " Use count: %u%s", gsub->use_count, VTY_NEWLINE); } +DEFUN_HIDDEN(reset_sgsn_state, + reset_sgsn_state_cmd, + "reset sgsn state", + "Remove all known subscriber, MM ctx and flush BSSGP queues Useful when running tests against the SGSN") +{ + struct gprs_subscr *subscr, *tmp_subscr; + struct sgsn_mm_ctx *mm, *tmp_mm; + + llist_for_each_entry_safe(mm, tmp_mm, &sgsn_mm_ctxts, list) + { + gsm0408_gprs_access_cancelled(mm, SGSN_ERROR_CAUSE_NONE); + } + vty_out(vty, "Cancelled MM Ctx. %s", VTY_NEWLINE); + + llist_for_each_entry_safe(subscr, tmp_subscr, gprs_subscribers, entry) { + gprs_subscr_get(subscr); + gprs_subscr_cancel(subscr); + gprs_subscr_put(subscr); + } + vty_out(vty, "Removed all gprs subscribers.%s", VTY_NEWLINE); + + bssgp_flush_all_queues(); + vty_out(vty, "Flushed all BSSGPs queues.%s", VTY_NEWLINE); + + /* remove all queues to bssgp */ + return CMD_SUCCESS; +} + DEFUN(show_subscr_cache, show_subscr_cache_cmd, "show subscriber cache", @@ -1310,6 +1341,7 @@ install_element(ENABLE_NODE, &update_subscr_cancel_cmd); install_element(ENABLE_NODE, &update_subscr_update_location_result_cmd); install_element(ENABLE_NODE, &update_subscr_update_auth_info_cmd); + install_element(ENABLE_NODE, &reset_sgsn_state_cmd); install_element(CONFIG_NODE, &cfg_sgsn_cmd); install_node(&sgsn_node, config_write_sgsn); -- To view, visit https://gerrit.osmocom.org/10370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I92096f3f6ea49e75676e30e9921d00210bac5382 Gerrit-Change-Number: 10370 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 15:54:16 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 15:54:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10376 ) Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 13 Aug 2018 15:54:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:16:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 16:16:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: use vty cmd `reset sgsn state`. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10388 ) Change subject: sgsn: use vty cmd `reset sgsn state`. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idff3de6f1b8f5cb503edc5c6256ce2bf7ec7aaa2 Gerrit-Change-Number: 10388 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Aug 2018 16:16:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:17:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:17:23 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10442 Change subject: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free ...................................................................... xua_msg: Avoid memleaking xua_msg_part in xua_msg_free Change-Id: If9ca8aea50b3715890b9ea0290471e95caed4624 --- M src/xua_msg.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/42/10442/1 diff --git a/src/xua_msg.c b/src/xua_msg.c index ed0cdc7..3bd6a6d 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -55,6 +56,12 @@ void xua_msg_free(struct xua_msg *msg) { + struct xua_msg_part *part, *tmp; + llist_for_each_entry_safe(part, tmp, &msg->headers, entry) { + llist_del(&part->entry); + talloc_free(part); + } + talloc_free(msg); } -- To view, visit https://gerrit.osmocom.org/10442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If9ca8aea50b3715890b9ea0290471e95caed4624 Gerrit-Change-Number: 10442 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:17:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:17:24 +0000 Subject: Change in libosmo-sccp[master]: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10443 Change subject: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua ...................................................................... sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua Fixes following error provided by LeakSanitizer: Indirect leak of 1496 byte(s) in 11 object(s) allocated from: #0 0x7f1eb3332d99 in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:86 #1 0x7f1eae617b61 in _talloc_zero (/usr/lib/libtalloc.so.2+0x5b61) #2 0x7f1eb063e365 in xua_msg_alloc /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:49 #3 0x7f1eb0650ee3 in osmo_sccp_to_xua /home/pespin/dev/sysmocom/git/libosmo-sccp/src/sccp2sua.c:1298 #4 0x7f1eb0668d6a in mtp_user_prim_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/sccp_user.c:173 #5 0x7f1eb068ba86 in deliver_to_mtp_user /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:94 #6 0x7f1eb068bf00 in hmdt_message_for_distribution /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:133 #7 0x7f1eb068d345 in m3ua_hmdc_rx_from_l2 /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:275 #8 0x7f1eb063c08f in m3ua_rx_xfer /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:586 #9 0x7f1eb063cea6 in m3ua_rx_msg /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:739 #10 0x7f1eb0687188 in xua_cli_read_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7.c:1590 #11 0x7f1eaff77db4 in osmo_stream_cli_read /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:192 #12 0x7f1eaff79091 in osmo_stream_cli_fd_cb /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:276 #13 0x7f1eaf259795 in osmo_fd_disp_fds /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:217 #14 0x7f1eaf259abb in osmo_select_main /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:257 #15 0x55666c1bebd3 in main /home/pespin/dev/sysmocom/git/osmo-msc/src/osmo-msc/msc_main.c:697 #16 0x7f1ead1c306a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #17 0x55666c1bc649 in _start (/home/pespin/dev/sysmocom/build/new/out/bin/osmo-msc+0x185649) The code path is the following, starting from mpt_user_prim_cb: mtp_user_prim_cb osmo_sccp_to_xua xua_msg_alloc scrc_rx_mtp_xfer_ind_xua sccp_scoc_rx_from_scrc scrc_node_6 scrc_node_4 scrc_translate_node_9 So the xua_msg is created in mtp_user_prim_cb through osmo_sccp_to_xua and then handed over to scrc_rx_mtp_xfer_ind_xua which transfers the xua_msg and thus should take ownserhip of it, and consecuently freeing it once it's done using it. Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f --- M src/sccp_scrc.c 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/43/10443/1 diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index cd01774..4cb3714 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -438,13 +438,14 @@ } /* Figure C.1/Q.714 Sheet 1 of 12, after we converted the - * MTP-TRANSFER.ind to SUA */ + * MTP-TRANSFER.ind to SUA. Gains ownsership of /ref xua and frees it once processed. */ int scrc_rx_mtp_xfer_ind_xua(struct osmo_sccp_instance *inst, struct xua_msg *xua) { struct osmo_sccp_addr called; uint32_t proto_class; struct xua_msg_part *hop_ctr_part; + int rc; LOGP(DLSS7, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ @@ -454,6 +455,7 @@ /* Node 1 (Sheet 3) */ /* deliver to SCOC */ sccp_scoc_rx_from_scrc(inst, xua); + xua_msg_free(xua); return 0; } /* We only treat connectionless and CR below */ @@ -463,7 +465,9 @@ /* Route on GT? */ if (called.ri != OSMO_SCCP_RI_GT) { /* Node 6 (Sheet 3) */ - return scrc_node_6(inst, xua, &called); + rc = scrc_node_6(inst, xua, &called); + xua_msg_free(xua); + return rc; } /* Message with hop-counter? */ hop_ctr_part = xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR); @@ -472,7 +476,9 @@ if (hop_counter <= 1) { /* Error: hop-counter violation */ /* node 4 */ - return scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); + rc = scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); + xua_msg_free(xua); + return rc; } /* Decrement hop-counter */ hop_counter--; @@ -492,5 +498,7 @@ default: break; } - return scrc_translate_node_9(inst, xua, &called); + rc = scrc_translate_node_9(inst, xua, &called); + xua_msg_free(xua); + return rc; } -- To view, visit https://gerrit.osmocom.org/10443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f Gerrit-Change-Number: 10443 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:17:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:17:25 +0000 Subject: Change in libosmo-sccp[master]: xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10444 Change subject: xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp ...................................................................... xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp >From LeakSanitizer report: Indirect leak of 384 byte(s) in 3 object(s) allocated from: #0 0x7f986da27d99 in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:86 #1 0x7f9868d0cb61 in _talloc_zero (/usr/lib/libtalloc.so.2+0x5b61) #2 0x7f986ad33766 in xua_msg_add_data /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:73 #3 0x7f986ad343c3 in xua_from_msg_common /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:143 #4 0x7f986ad347d2 in xua_from_nested /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:201 #5 0x7f986ad65563 in m3ua_rx_rkm_reg_rsp /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_rkm.c:431 #6 0x7f986ad65f96 in m3ua_rx_rkm /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_rkm.c:510 #7 0x7f986ad31ef7 in m3ua_rx_msg /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:749 #8 0x7f986ad7c1e8 in xua_cli_read_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7.c:1590 #9 0x7f986a66cdb4 in osmo_stream_cli_read /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:192 #10 0x7f986a66e091 in osmo_stream_cli_fd_cb /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:276 #11 0x7f986994e795 in osmo_fd_disp_fds /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:217 #12 0x7f986994eabb in osmo_select_main /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:257 #13 0x5630cb294bd3 in main /home/pespin/dev/sysmocom/git/osmo-msc/src/osmo-msc/msc_main.c:697 #14 0x7f98678b806a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #15 0x5630cb292649 in _start (/home/pespin/dev/sysmocom/build/new/out/bin/osmo-msc+0x185649) Following code paths: m3ua_rx_rkm_reg_rsp xua_from_nested xua_from_msg_common xua_msg_add_data talloc_zero (part) handle_rkey_reg_resp Take the chance to fix the same issue in m3ua_rx_rkm_dereg_rsp. Change-Id: I0b15d81099a9f8274b7e39962caa339da644e0dc --- M src/xua_rkm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/44/10444/1 diff --git a/src/xua_rkm.c b/src/xua_rkm.c index b79f7f3..a77460d 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -433,6 +433,7 @@ continue; handle_rkey_reg_resp(asp, inner); + xua_msg_free(inner); } return 0; } @@ -485,6 +486,7 @@ continue; handle_rkey_dereg_resp(asp, inner); + xua_msg_free(inner); } return 0; } -- To view, visit https://gerrit.osmocom.org/10444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0b15d81099a9f8274b7e39962caa339da644e0dc Gerrit-Change-Number: 10444 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:17:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 16:17:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10376 ) Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 13 Aug 2018 16:17:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:19:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 16:19:19 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10442 ) Change subject: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10442/1/src/xua_msg.c File src/xua_msg.c: https://gerrit.osmocom.org/#/c/10442/1/src/xua_msg.c at 59 PS1, Line 59: struct xua_msg_part *part, *tmp; why are we leaking parts As the xua_msg_part should all be allocated as children of the xua_msg, talloc should neatly clean all of the parts up. If you find parts that are allocated not as children of the xua_msg parent context, then I would think the bug is at that point. -- To view, visit https://gerrit.osmocom.org/10442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9ca8aea50b3715890b9ea0290471e95caed4624 Gerrit-Change-Number: 10442 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 13 Aug 2018 16:19:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:20:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 16:20:52 +0000 Subject: Change in libosmo-sccp[master]: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10443 ) Change subject: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10443/1/src/sccp_scrc.c File src/sccp_scrc.c: https://gerrit.osmocom.org/#/c/10443/1/src/sccp_scrc.c at 441 PS1, Line 441: ref isn't it /a or /arg xua if you're referrin to an argument? I thought /ref is for references to other symbols/functions? -- To view, visit https://gerrit.osmocom.org/10443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f Gerrit-Change-Number: 10443 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Aug 2018 16:20:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:21:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:21:00 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10442 ) Change subject: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free ...................................................................... Patch Set 1: I'm not sure it this one is actually needed thanks to talloc. I did this first before finding more "core" problems, or finding out tha tthe parent structure was neither freed. -- To view, visit https://gerrit.osmocom.org/10442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9ca8aea50b3715890b9ea0290471e95caed4624 Gerrit-Change-Number: 10442 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 13 Aug 2018 16:21:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:22:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 13 Aug 2018 16:22:24 +0000 Subject: Change in libosmo-sccp[master]: xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10444 ) Change subject: xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0b15d81099a9f8274b7e39962caa339da644e0dc Gerrit-Change-Number: 10444 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 13 Aug 2018 16:22:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:23:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:23:10 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10442 ) Change subject: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free ...................................................................... Patch Set 1: parts are allocated like this: int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, uint8_t *dat) { struct xua_msg_part *part; part = talloc_zero(msg, struct xua_msg_part); so probably no need, but still more clear to free them explicitly and cleanup the list anyway. -- To view, visit https://gerrit.osmocom.org/10442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9ca8aea50b3715890b9ea0290471e95caed4624 Gerrit-Change-Number: 10442 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 13 Aug 2018 16:23:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:23:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:23:20 +0000 Subject: Change in osmo-msc[master]: osmo-msc: Improve shutdown due to signal and print talloc report on exit Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10445 Change subject: osmo-msc: Improve shutdown due to signal and print talloc report on exit ...................................................................... osmo-msc: Improve shutdown due to signal and print talloc report on exit Same as we do in osmo-hlr. Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814 --- M src/osmo-msc/msc_main.c 1 file changed, 26 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/45/10445/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index aa06fb9..b1bb52a 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -110,6 +110,8 @@ static struct osmo_timer_list db_sync_timer; +static int quit = 0; + static void print_usage() { printf("Usage: osmo-msc\n"); @@ -233,10 +235,8 @@ switch (signal) { case SIGINT: case SIGTERM: - msc_network_shutdown(msc_network); - osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); - sleep(3); - exit(0); + LOGP(DMSC, LOGL_NOTICE, "Terminating due to signal %d\n", signal); + quit++; break; case SIGABRT: osmo_generate_backtrace(); @@ -692,8 +692,29 @@ } } - while (1) { + while (!quit) { log_reset_context(); osmo_select_main(0); } + + msc_network_shutdown(msc_network); + osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); + sleep(3); + + log_fini(); + + /** + * Report the heap state of root context, then free, + * so both ASAN and Valgrind are happy... + */ + talloc_report_full(tall_msc_ctx, stderr); + talloc_free(tall_msc_ctx); + + /** + * Report the heap state of NULL context, then free, + * so both ASAN and Valgrind are happy... + */ + talloc_report_full(NULL, stderr); + talloc_disable_null_tracking(); + return 0; } -- To view, visit https://gerrit.osmocom.org/10445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814 Gerrit-Change-Number: 10445 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:23:51 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:23:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS_Emulation: support multiple instances at the same time In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/10376 ) Change subject: NS_Emulation: support multiple instances at the same time ...................................................................... NS_Emulation: support multiple instances at the same time The NS_Emulation has configuration values hardcoded or bound to module parameters which prevents multiple instances. Replace the module parameter based configuration with configuration given when starting the NS_Emaulation. Change-Id: I9128f9ad5c372779c38799269393137ba52576cd --- M library/NS_Emulation.ttcn M pcu/PCU_Tests.cfg M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.default M sgsn/SGSN_Tests.ttcn 5 files changed, 62 insertions(+), 38 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 01d45b4..7cccb25 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -72,7 +72,8 @@ out NsUnitdataRequest; } with { extension "internal" }; - function NSStart() runs on NS_CT { + function NSStart(NSConfiguration init_config) runs on NS_CT { + config := init_config; f_init(); f_ScanEvents(); } @@ -80,7 +81,7 @@ private function f_init() runs on NS_CT { var Result res; /* Connect the UDP socket */ - res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {}}); + res := f_IPL4_connect(NSCP, config.remote_ip, config.remote_udp_port, config.local_ip, config.local_udp_port, 0, { udp := {}}); if (not ispresent(res.connId)) { setverdict(fail, "Could not connect NS UDP socket, check your configuration"); mtc.stop; @@ -97,6 +98,8 @@ /* NS-User SAP towards the user */ port NS_SP_PT NS_SP; + var NSConfiguration config; + var NseState g_state := NSE_S_DEAD_BLOCKED; var ConnectionId g_conn_id := -1; @@ -105,24 +108,24 @@ timer Tns_block := 10.0; } - modulepar { - PortNumber mp_local_udp_port := 23000; - charstring mp_local_ip := "127.0.0.1"; - PortNumber mp_remote_udp_port := 21000; - charstring mp_remote_ip := "127.0.0.1"; - Nsvci mp_nsvci := 0; - Nsvci mp_nsei := 2342; - }; + type record NSConfiguration { + PortNumber local_udp_port, + charstring local_ip, + PortNumber remote_udp_port, + charstring remote_ip, + Nsvci nsvci, + Nsvci nsei + } private function f_change_state(NseState new_state) runs on NS_CT { var NseState old_state := g_state; g_state := new_state; log("NS State Transition: ", old_state, " -> ", new_state); - NS_SP.send(t_NsStsInd(mp_nsei, mp_nsvci, old_state, new_state)); + NS_SP.send(t_NsStsInd(config.nsei, config.nsvci, old_state, new_state)); } private function f_sendReset() runs on NS_CT { - NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, mp_nsvci, mp_nsei))); + NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, config.nsvci, config.nsei))); g_state := NSE_S_WAIT_RESET; } @@ -137,7 +140,7 @@ } private function f_sendBlock(NsCause cause) runs on NS_CT { - NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, mp_nsvci))); + NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, config.nsvci))); Tns_block.start; } @@ -176,9 +179,9 @@ } /* Respond to RESET with correct NSEI/NSVCI */ - [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, mp_nsvci, mp_nsei))) -> value rf { + [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, config.nsvci, config.nsei))) -> value rf { f_change_state(NSE_S_ALIVE_BLOCKED); - NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(mp_nsvci, mp_nsei))); + NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(config.nsvci, config.nsei))); } /* Respond to RESET with wrong NSEI/NSVCI */ @@ -210,7 +213,7 @@ } } else if (g_state == NSE_S_WAIT_RESET) { alt { - [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(mp_nsvci, mp_nsei))) -> value rf { + [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(config.nsvci, config.nsei))) -> value rf { f_change_state(NSE_S_ALIVE_BLOCKED); f_sendAlive(); f_sendUnblock(); @@ -219,8 +222,8 @@ } else if (g_state == NSE_S_ALIVE_BLOCKED) { alt { /* bogus block, just respond with ACK */ - [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf { - NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci))); + [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, config.nsvci))) -> value rf { + NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(config.nsvci))); } /* Respond to UNBLOCK with UNBLOCK-ACK + change state */ [] NSCP.receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value rf { @@ -244,26 +247,26 @@ NSCP.send(t_NS_Send(g_conn_id, t_NS_UNBLOCK_ACK)); } /* Respond to BLOCK with BLOCK-ACK + change state */ - [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf { - NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci))); + [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, config.nsvci))) -> value rf { + NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(config.nsvci))); Tns_block.stop; f_change_state(NSE_S_ALIVE_BLOCKED); } - [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(mp_nsvci))) -> value rf { + [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(config.nsvci))) -> value rf { Tns_block.stop; } /* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */ [] NSCP.receive(t_NS_RecvFrom(t_NS_UNITDATA(?, ?, ?))) -> value rf { - NS_SP.send(t_NsUdInd(mp_nsei, + NS_SP.send(t_NsUdInd(config.nsei, oct2int(rf.msg.pDU_NS_Unitdata.bVCI), rf.msg.pDU_NS_Unitdata.nS_SDU)); } /* NS-UNITDATA.req from user to NS-UNITDATA PDU on network */ - [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, ?, omit)) -> value ud_req { + [] NS_SP.receive(t_NsUdReq(config.nsei, ?, ?, omit)) -> value ud_req { /* using raw octetstring PDU */ NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, ud_req.sdu))); } - [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, omit, ?)) -> value ud_req { + [] NS_SP.receive(t_NsUdReq(config.nsei, ?, omit, ?)) -> value ud_req { /* using decoded BSSGP PDU that we need to encode first */ var octetstring enc := enc_PDU_BSSGP(ud_req.bssgp); NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc))); diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index 20de54c..7e0b9f2 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -11,12 +11,15 @@ #mp_local_udp_port := 23000 #mp_remote_ip := "192.168.100.196" #mp_remote_udp_port := 21000 -NS_Emulation.mp_local_ip := "127.0.0.1" -NS_Emulation.mp_local_udp_port := 23000 -NS_Emulation.mp_remote_ip := "127.0.0.1" -NS_Emulation.mp_remote_udp_port := 23001 -NS_Emulation.mp_nsei := 1234 -NS_Emulation.mp_nsvci := 1234 +PCU_Tests.mp_nsconfig := { + local_ip := "127.0.0.1", + local_udp_port := 23000, + remote_ip := "127.0.0.1", + remote_udp_port := 23001, + nsvci := 1234, + nsei := 1234 +} + PCU_Tests.mp_gb_cfg := { nsei := 1234, bvci := 1234, diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index dfd380d..d59ac11 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -33,6 +33,15 @@ }, sgsn_role := true }; + + NSConfiguration mp_nsconfig := { + local_udp_port := 23000, + local_ip := "127.0.0.1", + remote_udp_port := 21000, + remote_ip := "127.0.0.1", + nsvci := 0, + nsei := 2342 + }; } type component dummy_CT extends BSSGP_Client_CT { @@ -66,7 +75,7 @@ connect(bssgp_component:BSCP, ns_component:NS_SP); /* connect lower-end of NS emulation to NS_CODEC_PORT (on top of IPl4) */ map(ns_component:NSCP, system:NS_CODEC_PORT); - ns_component.start(NSStart()); + ns_component.start(NSStart(mp_nsconfig)); bssgp_component.start(BssgpStart(mp_gb_cfg)); lapdm_component := lapdm_CT.create; diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index 3957e82..82682e2 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -20,12 +20,12 @@ [MODULE_PARAMETERS] -#NS_Emulation.mp_local_ip := "192.168.100.239" -NS_Emulation.mp_local_udp_port := 21000 -#NS_Emulation.mp_remote_ip := "192.168.100.196" -NS_Emulation.mp_remote_udp_port := 23000 -NS_Emulation.mp_nsvci := 97 -NS_Emulation.mp_nsei := 96 +SGSN_Tests.mp_nsconfig := { + local_udp_port := 21000, + remote_udp_port := 23000, + nsvci := 97, + nsei := 96 +} Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSGSN"; [MAIN_CONTROLLER] diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 6c94d14..d2db909 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -43,6 +43,15 @@ charstring mp_hlr_ip := "127.0.0.1"; integer mp_hlr_port := 4222; charstring mp_ggsn_ip := "127.0.0.2"; + + NSConfiguration mp_nsconfig := { + local_udp_port := 23000, + local_ip := "127.0.0.1", + remote_udp_port := 21000, + remote_ip := "127.0.0.1", + nsvci := 0, + nsei := 2342 + }; }; type record GbInstance { @@ -106,7 +115,7 @@ /* connect lower end of NS emulation to NS codec port (on top of IPL4) */ map(gb.vc_NS:NSCP, system:NS_CODEC_PORT); - gb.vc_NS.start(NSStart()); + gb.vc_NS.start(NSStart(mp_nsconfig)); gb.vc_BSSGP.start(BssgpStart(gb.cfg)); } -- To view, visit https://gerrit.osmocom.org/10376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd Gerrit-Change-Number: 10376 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:31:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:31:21 +0000 Subject: Change in libosmo-sccp[master]: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10443 ) Change subject: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10443/1/src/sccp_scrc.c File src/sccp_scrc.c: https://gerrit.osmocom.org/#/c/10443/1/src/sccp_scrc.c at 441 PS1, Line 441: ref > isn't it /a or /arg xua if you're referrin to an argument? I thought /ref is for references to other [?] \a, actually with the inverted slash. https://www.stack.nl/~dimitri/doxygen/manual/commands.html#cmda -- To view, visit https://gerrit.osmocom.org/10443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f Gerrit-Change-Number: 10443 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 13 Aug 2018 16:31:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:33:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:33:19 +0000 Subject: Change in libosmo-sccp[master]: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer... In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10443 to look at the new patch set (#2). Change subject: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua ...................................................................... sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua Fixes following error provided by LeakSanitizer: Indirect leak of 1496 byte(s) in 11 object(s) allocated from: #0 0x7f1eb3332d99 in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:86 #1 0x7f1eae617b61 in _talloc_zero (/usr/lib/libtalloc.so.2+0x5b61) #2 0x7f1eb063e365 in xua_msg_alloc /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:49 #3 0x7f1eb0650ee3 in osmo_sccp_to_xua /home/pespin/dev/sysmocom/git/libosmo-sccp/src/sccp2sua.c:1298 #4 0x7f1eb0668d6a in mtp_user_prim_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/sccp_user.c:173 #5 0x7f1eb068ba86 in deliver_to_mtp_user /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:94 #6 0x7f1eb068bf00 in hmdt_message_for_distribution /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:133 #7 0x7f1eb068d345 in m3ua_hmdc_rx_from_l2 /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:275 #8 0x7f1eb063c08f in m3ua_rx_xfer /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:586 #9 0x7f1eb063cea6 in m3ua_rx_msg /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:739 #10 0x7f1eb0687188 in xua_cli_read_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7.c:1590 #11 0x7f1eaff77db4 in osmo_stream_cli_read /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:192 #12 0x7f1eaff79091 in osmo_stream_cli_fd_cb /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:276 #13 0x7f1eaf259795 in osmo_fd_disp_fds /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:217 #14 0x7f1eaf259abb in osmo_select_main /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:257 #15 0x55666c1bebd3 in main /home/pespin/dev/sysmocom/git/osmo-msc/src/osmo-msc/msc_main.c:697 #16 0x7f1ead1c306a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #17 0x55666c1bc649 in _start (/home/pespin/dev/sysmocom/build/new/out/bin/osmo-msc+0x185649) The code path is the following, starting from mpt_user_prim_cb: mtp_user_prim_cb osmo_sccp_to_xua xua_msg_alloc scrc_rx_mtp_xfer_ind_xua sccp_scoc_rx_from_scrc scrc_node_6 scrc_node_4 scrc_translate_node_9 So the xua_msg is created in mtp_user_prim_cb through osmo_sccp_to_xua and then handed over to scrc_rx_mtp_xfer_ind_xua which transfers the xua_msg and thus should take ownserhip of it, and consecuently freeing it once it's done using it. Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f --- M src/sccp_scrc.c 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/43/10443/2 -- To view, visit https://gerrit.osmocom.org/10443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f Gerrit-Change-Number: 10443 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:33:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 13 Aug 2018 16:33:32 +0000 Subject: Change in libosmo-sccp[master]: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/10442 ) Change subject: xua_msg: Avoid memleaking xua_msg_part in xua_msg_free ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If9ca8aea50b3715890b9ea0290471e95caed4624 Gerrit-Change-Number: 10442 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:36:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:36:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: create 3 instances of BSSGP at the same time In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10378 to look at the new patch set (#2). Change subject: sgsn: create 3 instances of BSSGP at the same time ...................................................................... sgsn: create 3 instances of BSSGP at the same time Allows to use different BSSGP connection within a single test. Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf --- M sgsn/SGSN_Tests.ttcn 1 file changed, 65 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/10378/2 -- To view, visit https://gerrit.osmocom.org/10378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf Gerrit-Change-Number: 10378 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:36:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:36:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: move LLC layer out of BSSGP In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10383 to look at the new patch set (#2). Change subject: BSSGP_Emulation: move LLC layer out of BSSGP ...................................................................... BSSGP_Emulation: move LLC layer out of BSSGP The LLC layer needs to be accessed by the SGSN tests in order to do multi-BSSGP tests. Otherwise the sgsn will see LLC frame with wrong sequence numbers and drop them. Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 --- M library/BSSGP_Emulation.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 54 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/10383/2 -- To view, visit https://gerrit.osmocom.org/10383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 Gerrit-Change-Number: 10383 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:36:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:36:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien... In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10386 to look at the new patch set (#2). Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept ...................................................................... sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept f_process_rau_accept can send the RAU Complete over the correct BSSGP Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/10386/2 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:41:57 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:41:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10392 to look at the new patch set (#3). Change subject: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach ...................................................................... sgsn: add TC_attach_gmm_attach_req_while_gmm_attach Testing the corner case of receiving a Attach Request while not (yet) sent an Attach Request. MS -> SGSN: Attach Request IMSI MS <- SGSN: Identity Request IMSI (optional) MS -> SGSN: Identity Response IMSI (optional) MS <- SGSN: Identity Request IMEI MS -> SGSN: Attach Request (2nd) MS <- SGSN: Identity Response IMEI MS <- SGSN: Attach Accept MS -> SGSN: Attach Complete Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/10392/3 -- To view, visit https://gerrit.osmocom.org/10392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 Gerrit-Change-Number: 10392 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:42:35 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:42:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: move LLC layer out of BSSGP In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10383 ) Change subject: BSSGP_Emulation: move LLC layer out of BSSGP ...................................................................... Patch Set 2: I've renamed the function to f_send_l3_gmm_llc -- To view, visit https://gerrit.osmocom.org/10383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 Gerrit-Change-Number: 10383 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 13 Aug 2018 16:42:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:42:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: move LLC layer out of BSSGP In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10383 ) Change subject: BSSGP_Emulation: move LLC layer out of BSSGP ...................................................................... Patch Set 2: I've renamed the function to f_send_l3_gmm_llc -- To view, visit https://gerrit.osmocom.org/10383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 Gerrit-Change-Number: 10383 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 13 Aug 2018 16:42:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 13 16:45:47 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 13 Aug 2018 16:45:47 +0000 Subject: Change in docker-playground[master]: SGSN_Tests: fix module parameters In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10441 ) Change subject: SGSN_Tests: fix module parameters ...................................................................... Patch Set 1: Verified+1 tested it on my machine -- To view, visit https://gerrit.osmocom.org/10441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d46c37b9c932582fe94e670d9347209bb599192 Gerrit-Change-Number: 10441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 13 Aug 2018 16:45:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 14 00:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 14 Aug 2018 00:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4916?= Message-ID: <670980170.194.1534207924001.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 787.53 KB...] ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from RUA_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: 'struct Member' declared inside parameter list A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ CC RUA_InitiatingMessage.o CC RUA_SuccessfulOutcome.o CC RUA_UnsuccessfulOutcome.o CC RUA_Connect.o CC RUA_DirectTransfer.o CC RUA_Disconnect.o CC RUA_ConnectionlessTransfer.o CC RUA_ErrorIndication.o CC RUA_PrivateMessage.o CC RUA_IE.o AR libosmo-asn1-rua.a make[5]: Entering directory '/build/deps/osmo-iuh/src/rua' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-iuh/src/rua' make[4]: Leaving directory '/build/deps/osmo-iuh/src/rua' Making install in ranap make[4]: Entering directory '/build/deps/osmo-iuh/src/ranap' CC RANAP_Presence.lo CC RANAP_Criticality.lo CC RANAP_PrivateIE-ID.lo CC RANAP_ProcedureCode.lo CC RANAP_ProtocolExtensionID.lo CC RANAP_ProtocolIE-ID.lo CC RANAP_TriggeringMessage.lo CC RANAP_IE-Extensions.lo CC RANAP_AccuracyFulfilmentIndicator.lo CC RANAP_AllocationOrRetentionPriority.lo CC RANAP_Alt-RAB-Parameters.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateType.lo CC RANAP_Alt-RAB-Parameter-MaxBitrates.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateList.lo CC RANAP_AlternativeRABConfigurationRequest.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.lo CC RANAP_APN.lo CC RANAP_AreaIdentity.lo CC RANAP_Ass-RAB-Parameters.lo CC RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../include/osmocom/ranap/RANAP_SAI.h:17, from ../../include/osmocom/ranap/RANAP_AreaIdentity.h:14, from RANAP_AreaIdentity.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: 'struct Member' declared inside parameter list A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ CC RANAP_Ass-RAB-Parameter-MaxBitrateList.lo CC RANAP_AuthorisedPLMNs.lo CC RANAP_AuthorisedSNAs.lo CC RANAP_BindingID.lo CC RANAP_BroadcastAssistanceDataDecipheringKeys.lo CC RANAP_Cause.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:14, from RANAP_AuthorisedPLMNs.c:7: ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: 'struct MemberC' declared inside parameter list A_SEQUENCE_OF(struct MemberC { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberC { ^ CC RANAP_CauseMisc.lo ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberC { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberC { ^ CC RANAP_CauseNAS.lo CC RANAP_CauseProtocol.lo CC RANAP_CauseRadioNetwork.lo CC RANAP_CauseRadioNetworkExtension.lo CC RANAP_CauseNon-Standard.lo CC RANAP_CauseTransmissionNetwork.lo CC RANAP_Cell-Access-Mode.lo CC RANAP_CellBased.lo CC RANAP_CellIdList.lo CC RANAP_Cell-Id.lo CC RANAP_Cell-Capacity-Class-Value.lo CC RANAP_CellLoadInformation.lo CC RANAP_CellLoadInformationGroup.lo CC RANAP_CellType.lo CC RANAP_ClientType.lo CC RANAP_CriticalityDiagnostics.lo CC RANAP_CriticalityDiagnostics-IE-List.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics.h:17, from RANAP_CriticalityDiagnostics.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: 'struct MemberG' declared inside parameter list A_SEQUENCE_OF(struct MemberG { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberG { ^ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberG { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberG { ^ CC RANAP_MessageStructure.lo CC RANAP_CGI.lo CC RANAP_ChosenEncryptionAlgorithm.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from RANAP_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: 'struct MemberG' declared inside parameter list A_SEQUENCE_OF(struct MemberG { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberG { ^ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberG { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberG { ^ CC RANAP_ChosenIntegrityProtectionAlgorithm.lo CC RANAP_CI.lo CC RANAP_ClassmarkInformation2.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_MessageStructure.h:14, from RANAP_MessageStructure.c:7: ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:23: warning: 'struct MemberL' declared inside parameter list A_SEQUENCE_OF(struct MemberL { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberL { ^ ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberL { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberL { ^ CC RANAP_ClassmarkInformation3.lo CC RANAP_CN-DomainIndicator.lo CC RANAP_CN-ID.lo CC RANAP_Correlation-ID.lo CC RANAP_CSFB-Information.lo CC RANAP_CSG-Id.lo CC RANAP_CSG-Id-List.lo CC RANAP_CSG-Membership-Status.lo /bin/bash: line 1: 6162 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.3-2d3f\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.3-2d3f\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.3-2d3f\" -DSTDC_HEADERS=1 -I. -Wall -I../../include -I/build/deps/install/stow/libasn1c/include/ -I/build/deps/install/stow/libasn1c/include/asn1c -I/build/deps/install/stow/libosmocore/include/ -g -O2 -Wall -MT RANAP_CSG-Membership-Status.lo -MD -MP -MF .deps/RANAP_CSG-Membership-Status.Tpo -c -o RANAP_CSG-Membership-Status.lo RANAP_CSG-Membership-Status.c make[4]: *** [RANAP_CSG-Membership-Status.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... Makefile:2494: recipe for target 'RANAP_CSG-Membership-Status.lo' failed make[4]: Leaving directory '/build/deps/osmo-iuh/src/ranap' Makefile:630: recipe for target 'install-recursive' failed make[3]: Leaving directory '/build/deps/osmo-iuh/src' make[3]: *** [install-recursive] Error 1 make[2]: *** [install] Error 2 Makefile:789: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/osmo-iuh/src' make[1]: *** [install-recursive] Error 1 Makefile:442: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-iuh' make: *** [install] Error 2 Makefile:741: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Aug 14 00:56:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 14 Aug 2018 00:56:18 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4917?= In-Reply-To: <670980170.194.1534207924001.JavaMail.jenkins@jenkins.osmocom.org> References: <670980170.194.1534207924001.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1275785757.195.1534208178133.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:52:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:52:38 +0000 Subject: Change in docker-playground[master]: SGSN_Tests: fix module parameters In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10441 ) Change subject: SGSN_Tests: fix module parameters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d46c37b9c932582fe94e670d9347209bb599192 Gerrit-Change-Number: 10441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 06:52:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:52:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:52:39 +0000 Subject: Change in docker-playground[master]: SGSN_Tests: fix module parameters In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10441 ) Change subject: SGSN_Tests: fix module parameters ...................................................................... SGSN_Tests: fix module parameters ttcn commit I9128f9ad5c372779c38799269393137ba52576cd moves the modules parameters from NS_Emulation to SGSN_Tests. Change-Id: I8d46c37b9c932582fe94e670d9347209bb599192 --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: lynxis lazus: Verified Harald Welte: Looks good to me, approved diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index ea193ef..92ed77b 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -12,8 +12,10 @@ *.SGSNVTY.CTRL_HOSTNAME := "172.18.8.10" [MODULE_PARAMETERS] -NS_Emulation.mp_local_ip := "172.18.8.103" -NS_Emulation.mp_remote_ip := "172.18.8.10" +SGSN_Tests.mp_nsconfig := { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" +} SGSN_Tests.mp_hlr_ip := "172.18.8.103" SGSN_Tests.mp_ggsn_ip := "172.18.8.103" -- To view, visit https://gerrit.osmocom.org/10441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8d46c37b9c932582fe94e670d9347209bb599192 Gerrit-Change-Number: 10441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:53:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:53:11 +0000 Subject: Change in libosmo-sccp[master]: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10443 ) Change subject: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f Gerrit-Change-Number: 10443 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 14 Aug 2018 06:53:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:53:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:53:13 +0000 Subject: Change in libosmo-sccp[master]: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10443 ) Change subject: sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua ...................................................................... sscp_scrc: Fix memleak of xua_msg when handing it to scrc_rx_mtp_xfer_ind_xua Fixes following error provided by LeakSanitizer: Indirect leak of 1496 byte(s) in 11 object(s) allocated from: #0 0x7f1eb3332d99 in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:86 #1 0x7f1eae617b61 in _talloc_zero (/usr/lib/libtalloc.so.2+0x5b61) #2 0x7f1eb063e365 in xua_msg_alloc /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:49 #3 0x7f1eb0650ee3 in osmo_sccp_to_xua /home/pespin/dev/sysmocom/git/libosmo-sccp/src/sccp2sua.c:1298 #4 0x7f1eb0668d6a in mtp_user_prim_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/sccp_user.c:173 #5 0x7f1eb068ba86 in deliver_to_mtp_user /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:94 #6 0x7f1eb068bf00 in hmdt_message_for_distribution /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:133 #7 0x7f1eb068d345 in m3ua_hmdc_rx_from_l2 /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7_hmrt.c:275 #8 0x7f1eb063c08f in m3ua_rx_xfer /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:586 #9 0x7f1eb063cea6 in m3ua_rx_msg /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:739 #10 0x7f1eb0687188 in xua_cli_read_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7.c:1590 #11 0x7f1eaff77db4 in osmo_stream_cli_read /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:192 #12 0x7f1eaff79091 in osmo_stream_cli_fd_cb /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:276 #13 0x7f1eaf259795 in osmo_fd_disp_fds /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:217 #14 0x7f1eaf259abb in osmo_select_main /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:257 #15 0x55666c1bebd3 in main /home/pespin/dev/sysmocom/git/osmo-msc/src/osmo-msc/msc_main.c:697 #16 0x7f1ead1c306a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #17 0x55666c1bc649 in _start (/home/pespin/dev/sysmocom/build/new/out/bin/osmo-msc+0x185649) The code path is the following, starting from mpt_user_prim_cb: mtp_user_prim_cb osmo_sccp_to_xua xua_msg_alloc scrc_rx_mtp_xfer_ind_xua sccp_scoc_rx_from_scrc scrc_node_6 scrc_node_4 scrc_translate_node_9 So the xua_msg is created in mtp_user_prim_cb through osmo_sccp_to_xua and then handed over to scrc_rx_mtp_xfer_ind_xua which transfers the xua_msg and thus should take ownserhip of it, and consecuently freeing it once it's done using it. Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f --- M src/sccp_scrc.c 1 file changed, 12 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index cd01774..9005dc7 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -438,13 +438,14 @@ } /* Figure C.1/Q.714 Sheet 1 of 12, after we converted the - * MTP-TRANSFER.ind to SUA */ + * MTP-TRANSFER.ind to SUA. Takes ownership of \a xua and frees it once processed. */ int scrc_rx_mtp_xfer_ind_xua(struct osmo_sccp_instance *inst, struct xua_msg *xua) { struct osmo_sccp_addr called; uint32_t proto_class; struct xua_msg_part *hop_ctr_part; + int rc; LOGP(DLSS7, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ @@ -454,6 +455,7 @@ /* Node 1 (Sheet 3) */ /* deliver to SCOC */ sccp_scoc_rx_from_scrc(inst, xua); + xua_msg_free(xua); return 0; } /* We only treat connectionless and CR below */ @@ -463,7 +465,9 @@ /* Route on GT? */ if (called.ri != OSMO_SCCP_RI_GT) { /* Node 6 (Sheet 3) */ - return scrc_node_6(inst, xua, &called); + rc = scrc_node_6(inst, xua, &called); + xua_msg_free(xua); + return rc; } /* Message with hop-counter? */ hop_ctr_part = xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR); @@ -472,7 +476,9 @@ if (hop_counter <= 1) { /* Error: hop-counter violation */ /* node 4 */ - return scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); + rc = scrc_node_4(inst, xua, SCCP_RETURN_CAUSE_HOP_COUNTER_VIOLATION); + xua_msg_free(xua); + return rc; } /* Decrement hop-counter */ hop_counter--; @@ -492,5 +498,7 @@ default: break; } - return scrc_translate_node_9(inst, xua, &called); + rc = scrc_translate_node_9(inst, xua, &called); + xua_msg_free(xua); + return rc; } -- To view, visit https://gerrit.osmocom.org/10443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I43e159c82b64bd85b185f77ee19b6455a96e082f Gerrit-Change-Number: 10443 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:53:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:53:31 +0000 Subject: Change in libosmo-sccp[master]: xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10444 ) Change subject: xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp ...................................................................... xua_rkm: Fix xua_msg memleank in handle_rkey_reg_resp >From LeakSanitizer report: Indirect leak of 384 byte(s) in 3 object(s) allocated from: #0 0x7f986da27d99 in __interceptor_malloc /build/gcc/src/gcc/libsanitizer/asan/asan_malloc_linux.cc:86 #1 0x7f9868d0cb61 in _talloc_zero (/usr/lib/libtalloc.so.2+0x5b61) #2 0x7f986ad33766 in xua_msg_add_data /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:73 #3 0x7f986ad343c3 in xua_from_msg_common /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:143 #4 0x7f986ad347d2 in xua_from_nested /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_msg.c:201 #5 0x7f986ad65563 in m3ua_rx_rkm_reg_rsp /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_rkm.c:431 #6 0x7f986ad65f96 in m3ua_rx_rkm /home/pespin/dev/sysmocom/git/libosmo-sccp/src/xua_rkm.c:510 #7 0x7f986ad31ef7 in m3ua_rx_msg /home/pespin/dev/sysmocom/git/libosmo-sccp/src/m3ua.c:749 #8 0x7f986ad7c1e8 in xua_cli_read_cb /home/pespin/dev/sysmocom/git/libosmo-sccp/src/osmo_ss7.c:1590 #9 0x7f986a66cdb4 in osmo_stream_cli_read /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:192 #10 0x7f986a66e091 in osmo_stream_cli_fd_cb /home/pespin/dev/sysmocom/git/libosmo-netif/src/stream.c:276 #11 0x7f986994e795 in osmo_fd_disp_fds /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:217 #12 0x7f986994eabb in osmo_select_main /home/pespin/dev/sysmocom/git/libosmocore/src/select.c:257 #13 0x5630cb294bd3 in main /home/pespin/dev/sysmocom/git/osmo-msc/src/osmo-msc/msc_main.c:697 #14 0x7f98678b806a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #15 0x5630cb292649 in _start (/home/pespin/dev/sysmocom/build/new/out/bin/osmo-msc+0x185649) Following code paths: m3ua_rx_rkm_reg_rsp xua_from_nested xua_from_msg_common xua_msg_add_data talloc_zero (part) handle_rkey_reg_resp Take the chance to fix the same issue in m3ua_rx_rkm_dereg_rsp. Change-Id: I0b15d81099a9f8274b7e39962caa339da644e0dc --- M src/xua_rkm.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/xua_rkm.c b/src/xua_rkm.c index b79f7f3..a77460d 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -433,6 +433,7 @@ continue; handle_rkey_reg_resp(asp, inner); + xua_msg_free(inner); } return 0; } @@ -485,6 +486,7 @@ continue; handle_rkey_dereg_resp(asp, inner); + xua_msg_free(inner); } return 0; } -- To view, visit https://gerrit.osmocom.org/10444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0b15d81099a9f8274b7e39962caa339da644e0dc Gerrit-Change-Number: 10444 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:53:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:53:48 +0000 Subject: Change in osmo-msc[master]: osmo-msc: Improve shutdown due to signal and print talloc report on exit In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10445 ) Change subject: osmo-msc: Improve shutdown due to signal and print talloc report on exit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814 Gerrit-Change-Number: 10445 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 06:53:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:53:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:53:49 +0000 Subject: Change in osmo-msc[master]: osmo-msc: Improve shutdown due to signal and print talloc report on exit In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10445 ) Change subject: osmo-msc: Improve shutdown due to signal and print talloc report on exit ...................................................................... osmo-msc: Improve shutdown due to signal and print talloc report on exit Same as we do in osmo-hlr. Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814 --- M src/osmo-msc/msc_main.c 1 file changed, 26 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index aa06fb9..b1bb52a 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -110,6 +110,8 @@ static struct osmo_timer_list db_sync_timer; +static int quit = 0; + static void print_usage() { printf("Usage: osmo-msc\n"); @@ -233,10 +235,8 @@ switch (signal) { case SIGINT: case SIGTERM: - msc_network_shutdown(msc_network); - osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); - sleep(3); - exit(0); + LOGP(DMSC, LOGL_NOTICE, "Terminating due to signal %d\n", signal); + quit++; break; case SIGABRT: osmo_generate_backtrace(); @@ -692,8 +692,29 @@ } } - while (1) { + while (!quit) { log_reset_context(); osmo_select_main(0); } + + msc_network_shutdown(msc_network); + osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL); + sleep(3); + + log_fini(); + + /** + * Report the heap state of root context, then free, + * so both ASAN and Valgrind are happy... + */ + talloc_report_full(tall_msc_ctx, stderr); + talloc_free(tall_msc_ctx); + + /** + * Report the heap state of NULL context, then free, + * so both ASAN and Valgrind are happy... + */ + talloc_report_full(NULL, stderr); + talloc_disable_null_tracking(); + return 0; } -- To view, visit https://gerrit.osmocom.org/10445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814 Gerrit-Change-Number: 10445 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:54:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:54:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: move LLC layer out of BSSGP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10383 ) Change subject: BSSGP_Emulation: move LLC layer out of BSSGP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 Gerrit-Change-Number: 10383 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 06:54:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 06:55:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 06:55:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10386 ) Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/10386/2/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/10386/2/sgsn/SGSN_Tests.ttcn at 445 PS2, Line 445: bsspb what is the meaning of this variable name? -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 06:55:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 09:32:18 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 09:32:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien... In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10386 to look at the new patch set (#3). Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept ...................................................................... sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept f_process_rau_accept can send the RAU Complete over the correct BSSGP Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/10386/3 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 09:42:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 14 Aug 2018 09:42:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10446 Change subject: fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup ...................................................................... fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup These tests were expecting two ClearCommands, but the MSC will only send one. Remove redundant calls to f_expect_clear() outside of the alt step. The expected ClearCommand is received inside the alt step. Change-Id: I77f189d9050a06fe6eac457312285cf173c842d5 --- M msc/MSC_Tests.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/10446/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index f70edd0..42ad27c 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -534,7 +534,6 @@ mtc.stop; } } - f_expect_clear(); } testcase TC_lu_imsi_reject() runs on MTC_CT { var BSC_ConnHdlr vc_conn; @@ -563,7 +562,6 @@ mtc.stop; } } - f_expect_clear(); } testcase TC_lu_imsi_timeout_gsup() runs on MTC_CT { var BSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/10446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I77f189d9050a06fe6eac457312285cf173c842d5 Gerrit-Change-Number: 10446 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 09:50:12 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 09:50:12 +0000 Subject: Change in osmo-sgsn[master]: tests: remove gmm unit tests In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9258 to look at the new patch set (#3). Change subject: tests: remove gmm unit tests ...................................................................... tests: remove gmm unit tests The test cases now implemented by TTCN3 which should not be as fragile as the unit tests. Because the unit tests expect a quite strong internal state to be happen. Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 --- M tests/sgsn/sgsn_test.c M tests/sgsn/sgsn_test.ok 2 files changed, 0 insertions(+), 836 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/9258/3 -- To view, visit https://gerrit.osmocom.org/9258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 Gerrit-Change-Number: 9258 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 10:11:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 10:11:36 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#4). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c A src/gprs/gprs_gmm_attach.h M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 8 files changed, 475 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/4 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 10:14:54 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 10:14:54 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#5). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c A src/gprs/gprs_gmm_attach.h M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 8 files changed, 475 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/5 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 11:25:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 11:25:36 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#6). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_gmm_attach.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 8 files changed, 475 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/6 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 11:34:02 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 11:34:02 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#7). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_gmm_attach.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 8 files changed, 475 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/7 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 11:38:51 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 11:38:51 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#8). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_gmm_attach.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 8 files changed, 474 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/8 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 11:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 14 Aug 2018 11:44:24 +0000 Subject: Change in osmo-msc[master]: osmo-msc: Improve shutdown due to signal and print talloc report on exit In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10445 ) Change subject: osmo-msc: Improve shutdown due to signal and print talloc report on exit ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10445/1/src/osmo-msc/msc_main.c File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/#/c/10445/1/src/osmo-msc/msc_main.c at 702 PS1, Line 702: sleep(3); BTW: not related to this change, but why do we need this call? The main loop is not being executed during sleep, so I think nothing actually happens... Correct me if I am wrong :) -- To view, visit https://gerrit.osmocom.org/10445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814 Gerrit-Change-Number: 10445 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 14 Aug 2018 11:44:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 11:46:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 14 Aug 2018 11:46:23 +0000 Subject: Change in osmo-msc[master]: osmo-msc: Improve shutdown due to signal and print talloc report on exit In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10445 ) Change subject: osmo-msc: Improve shutdown due to signal and print talloc report on exit ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10445/1/src/osmo-msc/msc_main.c File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/#/c/10445/1/src/osmo-msc/msc_main.c at 718 PS1, Line 718: talloc_disable_null_tracking(); Also, we don't have NULL context tracking enabled, so an additional patch is required now... -- To view, visit https://gerrit.osmocom.org/10445 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If6ea9171fd79f03251342f75987690b0d9dc3814 Gerrit-Change-Number: 10445 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 14 Aug 2018 11:46:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 14 12:05:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 14 Aug 2018 12:05:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-sysmo-usim-tool?= =?UTF-8?Q?_=C2=BB_a1=3Ddefault,a2=3Ddefault,a3=3Ddefault,simtester_#1?= Message-ID: <1327294250.205.1534248322008.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ Started by upstream project "master-sysmo-usim-tool" build number 1 originally caused by: Started by user lynxis Building remotely on simtester in workspace Cloning the remote Git repository Cloning repository git://git.sysmocom.de/sysmo-usim-tool > git init # timeout=10 Fetching upstream changes from git://git.sysmocom.de/sysmo-usim-tool > git --version # timeout=10 > git fetch --tags --progress git://git.sysmocom.de/sysmo-usim-tool +refs/heads/*:refs/remotes/origin/* > git config remote.origin.url git://git.sysmocom.de/sysmo-usim-tool # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url git://git.sysmocom.de/sysmo-usim-tool # timeout=10 Fetching upstream changes from git://git.sysmocom.de/sysmo-usim-tool > git fetch --tags --progress git://git.sysmocom.de/sysmo-usim-tool +refs/heads/*:refs/remotes/origin/* Checking out Revision 48c0993312abc58d2999c5296bcbd10dc8ac7565 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 48c0993312abc58d2999c5296bcbd10dc8ac7565 Commit message: "tests/test-data: Update ADM1 key" First time build. Skipping changelog. [simtester] $ /bin/sh -xe /tmp/jenkins4646114266799536115.sh + ./tests/run-tests ./tests/run-tests: 15: ./tests/run-tests: ./prepare: not found ==> Executing Testcase 01_auth.sh ./tests/run-tests: 21: ./tests/run-tests: ./01_auth.sh: not found diff: 01_auth.out: No such file or directory Test 01_auth.sh FAILED! ==> Executing Testcase 02_mode_read.sh ./tests/run-tests: 21: ./tests/run-tests: ./02_mode_read.sh: not found diff: 02_mode_read.out: No such file or directory Test 02_mode_read.sh FAILED! ==> Executing Testcase 03_mode_write.sh ./tests/run-tests: 21: ./tests/run-tests: ./03_mode_write.sh: not found diff: 03_mode_write.out: No such file or directory Test 03_mode_write.sh FAILED! ==> Executing Testcase 04_algo.sh ./tests/run-tests: 21: ./tests/run-tests: ./04_algo.sh: not found diff: 04_algo.out: No such file or directory Test 04_algo.sh FAILED! ==> Executing Testcase 05_milenage_par.sh ./tests/run-tests: 21: ./tests/run-tests: ./05_milenage_par.sh: not found diff: 05_milenage_par.out: No such file or directory Test 05_milenage_par.sh FAILED! ==> Executing Testcase 06_op_opc.sh ./tests/run-tests: 21: ./tests/run-tests: ./06_op_opc.sh: not found diff: 06_op_opc.out: No such file or directory Test 06_op_opc.sh FAILED! ==> Executing Testcase 07_ki.sh ./tests/run-tests: 21: ./tests/run-tests: ./07_ki.sh: not found diff: 07_ki.out: No such file or directory Test 07_ki.sh FAILED! ==> Executing Testcase 08_seq.sh ./tests/run-tests: 21: ./tests/run-tests: ./08_seq.sh: not found diff: 08_seq.out: No such file or directory Test 08_seq.sh FAILED! Summary: 8 Tests failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:08:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 14 Aug 2018 12:08:38 +0000 Subject: Change in osmo-msc[master]: osmo-msc: track the use of talloc NULL memory contexts Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10447 Change subject: osmo-msc: track the use of talloc NULL memory contexts ...................................................................... osmo-msc: track the use of talloc NULL memory contexts Tracking NULL memory contexts allows one to detect memory chunks, allocated outside the application's root context, which in most cases are results of some mistake. In b874486e8e48f033204bfcc86871dd851266d440 the repotring of NULL-context state was introduced, but without asking talloc to track the use of NULL memory contexts it doesn't make sense. Change-Id: I4b5e3946ee21c7d0ed6c66b1059dbce5ad312f88 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/10447/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index b1bb52a..86240d5 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -521,6 +521,9 @@ { int rc; + /* Track the use of talloc NULL memory contexts */ + talloc_enable_null_tracking(); + msc_vty_info.copyright = osmomsc_copyright; tall_msc_ctx = talloc_named_const(NULL, 1, "osmo_msc"); -- To view, visit https://gerrit.osmocom.org/10447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b5e3946ee21c7d0ed6c66b1059dbce5ad312f88 Gerrit-Change-Number: 10447 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 14 12:11:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 14 Aug 2018 12:11:54 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-sysmo-usim-?= =?UTF-8?Q?tool_=C2=BB_a1=3Ddefault,a2=3Ddefault,a3=3Ddefault,simtester_#2?= In-Reply-To: <1327294250.205.1534248322008.JavaMail.jenkins@jenkins.osmocom.org> References: <1327294250.205.1534248322008.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <479146434.206.1534248714648.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:13:50 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 12:13:50 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: introduce variable git_base_url to allow other do... Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10448 Change subject: jobs/master-builds: introduce variable git_base_url to allow other domains as git.osmocom.org ...................................................................... jobs/master-builds: introduce variable git_base_url to allow other domains as git.osmocom.org Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 --- M jobs/master-builds.yml 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/48/10448/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index bd4e239..75e6937 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -21,6 +21,7 @@ wrappers: [] trigger: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org + git_base_url: git.osmocom.org # in alphabetical order repos: @@ -354,7 +355,7 @@ artifact-num-to-keep: -1 description: | Automatic jenkins test job of - {repos} + {repos}

Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY! @@ -383,7 +384,7 @@ scm: - git: - url: git://git.osmocom.org/{repos} + url: git://{git_base_url}/{repos} branches: - 'origin/master' refspec: -- To view, visit https://gerrit.osmocom.org/10448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 Gerrit-Change-Number: 10448 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:13:50 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 12:13:50 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: add repo sysmo-usim-tool Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10449 Change subject: jobs/master-builds: add repo sysmo-usim-tool ...................................................................... jobs/master-builds: add repo sysmo-usim-tool Change-Id: I0e4fec571c3c373000c755cfdb5e56dc09d17413 --- M jobs/master-builds.yml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/10449/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 75e6937..209b0c5 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -338,6 +338,11 @@ - rtl-sdr: email: laforge at gnumonks.org steve at steve-m.de + - sysmo-usim-tool: + cmd: cd ./tests; ./run-tests + slave_axis: !!python/tuple [simtester] + git_base_url: git.sysmocom.de + jobs: - 'master-{repos}' -- To view, visit https://gerrit.osmocom.org/10449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0e4fec571c3c373000c755cfdb5e56dc09d17413 Gerrit-Change-Number: 10449 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:18:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 14 Aug 2018 12:18:14 +0000 Subject: Change in osmo-msc[master]: osmo-msc: free the VTY talloc context on exit Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10450 Change subject: osmo-msc: free the VTY talloc context on exit ...................................................................... osmo-msc: free the VTY talloc context on exit This is a follow up change before enabling the track of NULL talloc contexts. Since there is no other way to deinitialize libosmovty, let's free its root context on exit. Otherwise one would see lots of memory chunks on exit... Change-Id: I278f85f023210de6b4626d4493d10d20996f606a --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/50/10450/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index b1bb52a..2159d65 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -710,6 +710,9 @@ talloc_report_full(tall_msc_ctx, stderr); talloc_free(tall_msc_ctx); + /* FIXME: VTY code still uses NULL-context */ + talloc_free(tall_vty_ctx); + /** * Report the heap state of NULL context, then free, * so both ASAN and Valgrind are happy... -- To view, visit https://gerrit.osmocom.org/10450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I278f85f023210de6b4626d4493d10d20996f606a Gerrit-Change-Number: 10450 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:18:27 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 12:18:27 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: introduce variable git_base_url to allow other do... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10448 ) Change subject: jobs/master-builds: introduce variable git_base_url to allow other domains as git.osmocom.org ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 Gerrit-Change-Number: 10448 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 12:18:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:18:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 12:18:31 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: add repo sysmo-usim-tool In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10449 ) Change subject: jobs/master-builds: add repo sysmo-usim-tool ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e4fec571c3c373000c755cfdb5e56dc09d17413 Gerrit-Change-Number: 10449 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 12:18:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:41:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 14 Aug 2018 12:41:00 +0000 Subject: Change in osmo-msc[master]: osmo-msc: track the use of talloc NULL memory contexts In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10447 ) Change subject: osmo-msc: track the use of talloc NULL memory contexts ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b5e3946ee21c7d0ed6c66b1059dbce5ad312f88 Gerrit-Change-Number: 10447 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 14 Aug 2018 12:41:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 12:50:05 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 12:50:05 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#9). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_gmm_attach.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 9 files changed, 475 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/9 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:22:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:22:26 +0000 Subject: Change in osmo-msc[master]: osmo-msc: track the use of talloc NULL memory contexts In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10447 ) Change subject: osmo-msc: track the use of talloc NULL memory contexts ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b5e3946ee21c7d0ed6c66b1059dbce5ad312f88 Gerrit-Change-Number: 10447 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 14 Aug 2018 13:22:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:22:34 +0000 Subject: Change in osmo-msc[master]: osmo-msc: free the VTY talloc context on exit In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10450 ) Change subject: osmo-msc: free the VTY talloc context on exit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I278f85f023210de6b4626d4493d10d20996f606a Gerrit-Change-Number: 10450 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 13:22:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:22:37 +0000 Subject: Change in osmo-msc[master]: osmo-msc: free the VTY talloc context on exit In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10450 ) Change subject: osmo-msc: free the VTY talloc context on exit ...................................................................... osmo-msc: free the VTY talloc context on exit This is a follow up change before enabling the track of NULL talloc contexts. Since there is no other way to deinitialize libosmovty, let's free its root context on exit. Otherwise one would see lots of memory chunks on exit... Change-Id: I278f85f023210de6b4626d4493d10d20996f606a --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index b1bb52a..2159d65 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -710,6 +710,9 @@ talloc_report_full(tall_msc_ctx, stderr); talloc_free(tall_msc_ctx); + /* FIXME: VTY code still uses NULL-context */ + talloc_free(tall_vty_ctx); + /** * Report the heap state of NULL context, then free, * so both ASAN and Valgrind are happy... -- To view, visit https://gerrit.osmocom.org/10450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I278f85f023210de6b4626d4493d10d20996f606a Gerrit-Change-Number: 10450 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:22:37 +0000 Subject: Change in osmo-msc[master]: osmo-msc: track the use of talloc NULL memory contexts In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10447 ) Change subject: osmo-msc: track the use of talloc NULL memory contexts ...................................................................... osmo-msc: track the use of talloc NULL memory contexts Tracking NULL memory contexts allows one to detect memory chunks, allocated outside the application's root context, which in most cases are results of some mistake. In b874486e8e48f033204bfcc86871dd851266d440 the repotring of NULL-context state was introduced, but without asking talloc to track the use of NULL memory contexts it doesn't make sense. Change-Id: I4b5e3946ee21c7d0ed6c66b1059dbce5ad312f88 --- M src/osmo-msc/msc_main.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 2159d65..1a10278 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -521,6 +521,9 @@ { int rc; + /* Track the use of talloc NULL memory contexts */ + talloc_enable_null_tracking(); + msc_vty_info.copyright = osmomsc_copyright; tall_msc_ctx = talloc_named_const(NULL, 1, "osmo_msc"); -- To view, visit https://gerrit.osmocom.org/10447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b5e3946ee21c7d0ed6c66b1059dbce5ad312f88 Gerrit-Change-Number: 10447 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:23:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:23:16 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: introduce variable git_base_url to allow other do... In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/10448 ) Change subject: jobs/master-builds: introduce variable git_base_url to allow other domains than git.osmocom.org ...................................................................... jobs/master-builds: introduce variable git_base_url to allow other domains than git.osmocom.org Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 --- M jobs/master-builds.yml 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/48/10448/2 -- To view, visit https://gerrit.osmocom.org/10448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 Gerrit-Change-Number: 10448 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:23:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:23:27 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: introduce variable git_base_url to allow other do... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10448 ) Change subject: jobs/master-builds: introduce variable git_base_url to allow other domains than git.osmocom.org ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 Gerrit-Change-Number: 10448 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 13:23:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:23:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:23:40 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: add repo sysmo-usim-tool In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10449 ) Change subject: jobs/master-builds: add repo sysmo-usim-tool ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e4fec571c3c373000c755cfdb5e56dc09d17413 Gerrit-Change-Number: 10449 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 13:23:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:24:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:24:01 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: add repo sysmo-usim-tool In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10449 ) Change subject: jobs/master-builds: add repo sysmo-usim-tool ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/10449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e4fec571c3c373000c755cfdb5e56dc09d17413 Gerrit-Change-Number: 10449 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 13:24:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:24:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:24:03 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: add repo sysmo-usim-tool In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10449 ) Change subject: jobs/master-builds: add repo sysmo-usim-tool ...................................................................... jobs/master-builds: add repo sysmo-usim-tool Change-Id: I0e4fec571c3c373000c755cfdb5e56dc09d17413 --- M jobs/master-builds.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index bd4e239..c65cc1c 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -337,6 +337,11 @@ - rtl-sdr: email: laforge at gnumonks.org steve at steve-m.de + - sysmo-usim-tool: + cmd: cd ./tests; ./run-tests + slave_axis: !!python/tuple [simtester] + git_base_url: git.sysmocom.de + jobs: - 'master-{repos}' -- To view, visit https://gerrit.osmocom.org/10449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0e4fec571c3c373000c755cfdb5e56dc09d17413 Gerrit-Change-Number: 10449 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:24:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:24:35 +0000 Subject: Change in osmo-sgsn[master]: tests: remove gmm unit tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9258 ) Change subject: tests: remove gmm unit tests ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 Gerrit-Change-Number: 9258 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 14 Aug 2018 13:24:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:24:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10446 ) Change subject: fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77f189d9050a06fe6eac457312285cf173c842d5 Gerrit-Change-Number: 10446 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 13:24:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:24:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:24:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10446 ) Change subject: fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup ...................................................................... fix expectations of TC_lu_imsi_reject and TC_lu_imsi_timeout_gsup These tests were expecting two ClearCommands, but the MSC will only send one. Remove redundant calls to f_expect_clear() outside of the alt step. The expected ClearCommand is received inside the alt step. Change-Id: I77f189d9050a06fe6eac457312285cf173c842d5 --- M msc/MSC_Tests.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index f70edd0..42ad27c 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -534,7 +534,6 @@ mtc.stop; } } - f_expect_clear(); } testcase TC_lu_imsi_reject() runs on MTC_CT { var BSC_ConnHdlr vc_conn; @@ -563,7 +562,6 @@ mtc.stop; } } - f_expect_clear(); } testcase TC_lu_imsi_timeout_gsup() runs on MTC_CT { var BSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/10446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I77f189d9050a06fe6eac457312285cf173c842d5 Gerrit-Change-Number: 10446 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:25:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:25:07 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds: introduce variable git_base_url to allow other do... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10448 ) Change subject: jobs/master-builds: introduce variable git_base_url to allow other domains than git.osmocom.org ...................................................................... jobs/master-builds: introduce variable git_base_url to allow other domains than git.osmocom.org Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 --- M jobs/master-builds.yml 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved lynxis lazus: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index c65cc1c..209b0c5 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -21,6 +21,7 @@ wrappers: [] trigger: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org + git_base_url: git.osmocom.org # in alphabetical order repos: @@ -359,7 +360,7 @@ artifact-num-to-keep: -1 description: | Automatic jenkins test job of - {repos} + {repos}

Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY! @@ -388,7 +389,7 @@ scm: - git: - url: git://git.osmocom.org/{repos} + url: git://{git_base_url}/{repos} branches: - 'origin/master' refspec: -- To view, visit https://gerrit.osmocom.org/10448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia37b5f761c47411ac7eab092f3437acecc492f22 Gerrit-Change-Number: 10448 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:25:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:25:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of B... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10377 ) Change subject: BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of BSSGP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd7abba826a08b582361e9c255e9c44185e14067 Gerrit-Change-Number: 10377 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 13:25:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:25:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:25:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: create 3 instances of BSSGP at the same time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10378 ) Change subject: sgsn: create 3 instances of BSSGP at the same time ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf Gerrit-Change-Number: 10378 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 14 Aug 2018 13:25:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of B... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10377 ) Change subject: BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of BSSGP ...................................................................... BSSGP_Emulation.ttcn: extend BSSGP_Client_CT to hold 3 instances of BSSGP Change-Id: Ibd7abba826a08b582361e9c255e9c44185e14067 --- M library/BSSGP_Emulation.ttcn M pcu/PCU_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 112 insertions(+), 112 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index 8b3b9eb..a9d2a25 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -79,9 +79,9 @@ ***********************************************************************/ type component BSSGP_Client_CT { - port BSSGP_PT BSSGP; - port BSSGP_PT BSSGP_SIG; - port BSSGP_PROC_PT BSSGP_PROC; + port BSSGP_PT BSSGP[3]; + port BSSGP_PT BSSGP_SIG[3]; + port BSSGP_PROC_PT BSSGP_PROC[3]; }; /*********************************************************************** @@ -660,14 +660,14 @@ return dec; } -function f_bssgp_client_register(hexstring imsi, OCT4 tlli, BssgpCellId cell_id, BSSGP_PROC_PT PT := BSSGP_PROC) +function f_bssgp_client_register(hexstring imsi, OCT4 tlli, BssgpCellId cell_id, BSSGP_PROC_PT PT := BSSGP_PROC[0]) runs on BSSGP_Client_CT { PT.call(BSSGP_register_client:{imsi, tlli, cell_id}) { [] PT.getreply(BSSGP_register_client:{imsi, tlli, cell_id}) {}; } } -function f_bssgp_client_unregister(hexstring imsi, BSSGP_PROC_PT PT := BSSGP_PROC) +function f_bssgp_client_unregister(hexstring imsi, BSSGP_PROC_PT PT := BSSGP_PROC[0]) runs on BSSGP_Client_CT { PT.call(BSSGP_unregister_client:{imsi}) { [] PT.getreply(BSSGP_unregister_client:{imsi}) {}; @@ -675,7 +675,7 @@ } /* TS 44.064 7.2.1.1 LLGMM-ASSIGN */ -function f_bssgp_client_llgmm_assign(OCT4 tlli_old, OCT4 tlli_new, BSSGP_PROC_PT PT := BSSGP_PROC) +function f_bssgp_client_llgmm_assign(OCT4 tlli_old, OCT4 tlli_new, BSSGP_PROC_PT PT := BSSGP_PROC[0]) runs on BSSGP_Client_CT { PT.call(BSSGP_llgmm_assign:{tlli_old, tlli_new}) { [] PT.getreply(BSSGP_llgmm_assign:{tlli_old, tlli_new}) {}; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index d59ac11..a63ca1d 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -68,9 +68,9 @@ ns_component := NS_CT.create; bssgp_component := BSSGP_CT.create; /* connect our BSSGP port to the BSSGP Emulation */ - connect(self:BSSGP, bssgp_component:BSSGP_SP); - connect(self:BSSGP_SIG, bssgp_component:BSSGP_SP_SIG); - connect(self:BSSGP_PROC, bssgp_component:BSSGP_PROC); + connect(self:BSSGP[0], bssgp_component:BSSGP_SP); + connect(self:BSSGP_SIG[0], bssgp_component:BSSGP_SP_SIG); + connect(self:BSSGP_PROC[0], bssgp_component:BSSGP_PROC); /* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/ connect(bssgp_component:BSCP, ns_component:NS_SP); /* connect lower-end of NS emulation to NS_CODEC_PORT (on top of IPl4) */ @@ -186,7 +186,7 @@ log(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); - BSSGP.send(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); + BSSGP[0].send(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); } /* Establish BSSGP connection to PCU */ @@ -196,8 +196,8 @@ f_init(); T.start alt { - [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { } + [] BSSGP[0].receive { repeat; } [] T.timeout { setverdict(fail, "Timeout establishing BSSGP connection"); mtc.stop; @@ -215,17 +215,17 @@ f_init(); /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ - BSSGP_SIG.send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); - BSSGP_SIG.send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); + BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); + BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); while (true) { var BssgpDecoded bd; alt { - [] BSSGP.receive(tr_BD_L3_MT(?)) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(?)) -> value bd { log("BSSGP Rx: ", bd); } - [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } + [] BSSGP[0].receive { repeat; } } } } @@ -283,7 +283,7 @@ timer T := 5.0; T.start; alt { - [] BSSGP.receive(bd_exp) { + [] BSSGP[0].receive(bd_exp) { log("found matching BSSGP UL-UNITDATA PDU"); } [] T.timeout { @@ -355,14 +355,14 @@ while (true) { var BssgpDecoded bd; alt { - [] BSSGP.receive(tr_BD_BSSGP(?)) -> value bd { + [] BSSGP[0].receive(tr_BD_BSSGP(?)) -> value bd { log("BSSGP Rx: ", bd); //log("GMM Rx: ", dec_PDU_L3_MS_SGSN(pdu.payload)); g_mmctx.tlli := bd.bssgp.pDU_BSSGP_UL_UNITDATA.tLLI; tx_gmm(LLC_CR_DL_CMD, gmm_auth_req); } - [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } + [] BSSGP[0].receive { repeat; } } } } diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index d2db909..6bf2d60 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -259,8 +259,8 @@ }; vc_conn := BSSGP_ConnHdlr.create(id); - connect(vc_conn:BSSGP, gb.vc_BSSGP:BSSGP_SP); - connect(vc_conn:BSSGP_PROC, gb.vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[0], gb.vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[0], gb.vc_BSSGP:BSSGP_PROC); connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); @@ -321,14 +321,14 @@ altstep as_mm_identity() runs on BSSGP_ConnHdlr { var MobileL3_CommonIE_Types.MobileIdentityLV mi; - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } } @@ -374,7 +374,7 @@ var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; - BSSGP.receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; + BSSGP[0].receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; l3_mt := bd.l3_mt; var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); @@ -397,7 +397,7 @@ l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); } - BSSGP.send(l3_mo); + BSSGP[0].send(l3_mo); } else { /* wait for identity procedure */ f_sleep(1.0); @@ -503,16 +503,16 @@ * revisionLevelIndicatior is at the wrong place! */ attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; - BSSGP.send(attach_req); + BSSGP[0].send(attach_req); f_gmm_auth(umts_aka_challenge, force_gsm_sres); /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); } private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { @@ -564,16 +564,16 @@ private function f_TC_attach_auth_id_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) { /* don't send ID Response */ repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('09'O))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('09'O))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(fail, "Wrong Attach Reject Cause"); mtc.stop; } @@ -590,13 +590,13 @@ private function f_TC_attach_auth_sai_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { } } /* don't send SAI-response from HLR */ - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); setverdict(pass); } testcase TC_attach_auth_sai_timeout() runs on test_CT { @@ -610,14 +610,14 @@ private function f_TC_attach_auth_sai_reject(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { GSUP.send(ts_GSUP_SAI_ERR(g_pars.imsi, 23)); } } - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))); setverdict(pass); } testcase TC_attach_auth_sai_reject() runs on test_CT { @@ -632,16 +632,16 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); /* Never follow-up with ISD_REQ or UL_RES */ alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); setverdict(fail); mtc.stop; @@ -661,17 +661,17 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { GSUP.send(ts_GSUP_UL_ERR(g_pars.imsi, 0)); } alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); setverdict(fail); mtc.stop; @@ -692,15 +692,15 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_combined() runs on test_CT { @@ -718,12 +718,12 @@ g_pars.net.expect_auth := false; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_accept_all() runs on test_CT { @@ -745,16 +745,16 @@ g_pars.net.expect_auth := false; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('07'O))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('07'O))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { setverdict(fail); mtc.stop; } @@ -777,13 +777,13 @@ private function f_TC_rau_unknown(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP.send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); + BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT('0a'O))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT('0a'O))) { setverdict(pass); } /* FIXME: Expect XID RESET? */ - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } testcase TC_rau_unknown() runs on test_CT { @@ -801,18 +801,18 @@ f_TC_attach(id); /* then send RAU */ - BSSGP.send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); + BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); - BSSGP.send(ts_GMM_RAU_COMPL); + BSSGP[0].send(ts_GMM_RAU_COMPL); setverdict(pass); } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { setverdict(fail, "Unexpected RAU Reject"); mtc.stop; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } testcase TC_attach_rau() runs on test_CT { @@ -827,7 +827,7 @@ function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; timer T := 5.0; - BSSGP.send(ts_GMM_DET_REQ_MO(detach_type, power_off)); + BSSGP[0].send(ts_GMM_DET_REQ_MO(detach_type, power_off)); if (expect_purge) { GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS)); GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi)); @@ -838,7 +838,7 @@ setverdict(fail, "Unexpected GSUP PURGE MS for unregistered TLLI"); mtc.stop; } - [power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { g_pars.ra := omit; setverdict(fail, "Unexpected ATTACH ACCEPT in no-power-off DETACH"); mtc.stop; @@ -847,12 +847,12 @@ [power_off] T.timeout { setverdict(pass); } - [not power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [not power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { g_pars.ra := omit; setverdict(pass); /* TODO: check if any PDP contexts are deactivated on network side? */ } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } @@ -954,7 +954,7 @@ recovery := ts_Recovery(apars.ggsn_restart_ctr); } - BSSGP.send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { f_process_gtp_ctx_act_req(apars, g_ud.gtpc); @@ -967,18 +967,18 @@ omit, recovery)); } alt { - [exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause))) { + [exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, apars.exp_rej_cause))) { setverdict(pass); } - [exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT)) { + [exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT)) { setverdict(fail, "Unexpected PDP CTX ACT ACC"); mtc.stop; } - [not exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { + [not exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_REJ(apars.tid, ?))) { setverdict(fail, "Unexpected PDP CTX ACT FAIL"); mtc.stop; } - [not exp_rej] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(apars.tid, apars.sapi))) { + [not exp_rej] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(apars.tid, apars.sapi))) { setverdict(pass); } [] as_xid(apars); @@ -989,14 +989,14 @@ var boolean exp_rej := ispresent(apars.exp_rej_cause); var Gtp1cUnitdata g_ud; - BSSGP.send(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); + BSSGP[0].send(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); - BSSGP.clear; + BSSGP[0].clear; GTP.send(ts_GTPC_DeletePdpResp(g_ud.peer, seq_nr, apars.sgsn_tei_c, '7F'O)); } alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_ACCEPT_MT(apars.tid))) { setverdict(pass); } [] as_xid(apars); @@ -1008,7 +1008,7 @@ var integer seq_nr := 23; var GtpPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); - BSSGP.clear; + BSSGP[0].clear; if (error_ind) { GTP.send(ts_GTPU_ErrorIndication(peer, 0 /* seq */, apars.ggsn_tei_u, apars.ggsn_ip_u)); } else { @@ -1019,8 +1019,8 @@ T.start; alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { - BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { + BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); } [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { repeat; @@ -1124,7 +1124,7 @@ } private altstep as_xid(PdpActPars apars) runs on BSSGP_ConnHdlr { - [] BSSGP.receive(tr_BD_LLC(tr_LLC_XID(?, apars.sapi))) { + [] BSSGP[0].receive(tr_BD_LLC(tr_LLC_XID(?, apars.sapi))) { repeat; } } @@ -1169,7 +1169,7 @@ /* Expect PDU via BSSGP/LLC on simulated PCU from SGSN */ alt { [] as_xid(apars); - [] BSSGP.receive(tr_BD_SNDCP(apars.sapi, tr_SN_UD(apars.nsapi, payload))); + [] BSSGP[0].receive(tr_BD_SNDCP(apars.sapi, tr_SN_UD(apars.nsapi, payload))); } } @@ -1178,7 +1178,7 @@ /* Send PDU via SNDCP/LLC/BSSGP/NS via simulated MS/PCU to the SGSN */ var GtpPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); - BSSGP.send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, 0)); + BSSGP[0].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, 0)); /* Expect PDU via GTP from SGSN on simulated GGSN */ alt { [] GTP.receive(tr_GTPU_GPDU(peer, apars.ggsn_tei_u, payload)); @@ -1203,22 +1203,22 @@ /* PDP Context activation for not-attached subscriber; expect fail */ private function f_TC_pdp_act_unattached(charstring id) runs on BSSGP_ConnHdlr { var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); - BSSGP.send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); alt { /* We might want toalso actually expect a PDPC CTX ACT REJ? */ - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(?, ?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(?, ?))) { setverdict(pass); } [] GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) { setverdict(fail, "Unexpected GTP PDP CTX ACT"); mtc.stop; } - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(?, ?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_ACT_PDP_ACCEPT(?, ?))) { setverdict(fail, "Unexpected SM PDP CTX ACT ACK"); mtc.stop; } - [] BSSGP.receive { repeat; } + [] BSSGP[0].receive { repeat; } } } testcase TC_pdp_act_unattached() runs on test_CT { @@ -1350,8 +1350,8 @@ } var OCT1 cause_network_failure := int2oct(38, 1) alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true))) { - BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true))) { + BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } [] as_xid(apars); @@ -1419,20 +1419,20 @@ /* then activate PDP context */ f_pdp_ctx_act(apars); - BSSGP.clear; + BSSGP[0].clear; peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); GTP.send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); for (i := 0; i < 5; i := i+1) { alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) {} + [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) {} [] as_xid(apars); } } GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {} - BSSGP.send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } testcase TC_attach_pdp_act_deact_mt_t3395_expire() runs on test_CT { @@ -1455,7 +1455,7 @@ timer T := 5.0; T.start; alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(*, *, *))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(*, *, *))) { T.stop; setverdict(fail, "Unexpected GMM Detach Request"); mtc.stop; @@ -1464,7 +1464,7 @@ setverdict(pass); mtc.stop; } - [] BSSGP.receive { + [] BSSGP[0].receive { repeat; } } @@ -1514,8 +1514,8 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); /* MS: receive a Detach Request */ - BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); - BSSGP.send(ts_GMM_DET_ACCEPT_MO); + BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); + BSSGP[0].send(ts_GMM_DET_ACCEPT_MO); setverdict(pass); } @@ -1606,18 +1606,18 @@ var integer count_req := 0; var MobileL3_CommonIE_Types.MobileIdentityLV mi; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { /* break */ } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { /* ignore ID REQ IMEI */ count_req := count_req + 1; repeat; @@ -1654,20 +1654,20 @@ /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */ g_pars.p_tmsi := 'c0000035'O; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { /* break */ } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { /* ignore ID REQ IMSI */ count_req := count_req + 1; repeat; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP.send(ts_GMM_ID_RESP(mi)); + BSSGP[0].send(ts_GMM_ID_RESP(mi)); repeat; } } @@ -1728,16 +1728,16 @@ /* there is no auth */ g_pars.net.expect_auth := false; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { setverdict(fail, "Received unexpected GMM Attach REJECT"); mtc.stop; } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) -> value bd { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); - BSSGP.send(ts_GMM_ATTACH_COMPL); + BSSGP[0].send(ts_GMM_ATTACH_COMPL); setverdict(pass); } } @@ -1774,14 +1774,14 @@ private function f_TC_attach_check_complete_resend(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); f_gmm_auth(); alt { - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { /* break */ } - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { + [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) { /* ignore */ count_req := count_req + 1; repeat; -- To view, visit https://gerrit.osmocom.org/10377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd7abba826a08b582361e9c255e9c44185e14067 Gerrit-Change-Number: 10377 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: create 3 instances of BSSGP at the same time In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10378 ) Change subject: sgsn: create 3 instances of BSSGP at the same time ...................................................................... sgsn: create 3 instances of BSSGP at the same time Allows to use different BSSGP connection within a single test. Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf --- M sgsn/SGSN_Tests.ttcn 1 file changed, 65 insertions(+), 56 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 6bf2d60..3616a62 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -60,8 +60,11 @@ BssgpConfig cfg }; +type record length(3) of GbInstance GbInstances; +type record length(3) of BssgpCellId BssgpCellIds; + type component test_CT { - var GbInstance g_gb[3]; + var GbInstances g_gb; var GSUP_Emulation_CT vc_GSUP; var IPA_Emulation_CT vc_GSUP_IPA; @@ -101,15 +104,15 @@ OCT4 tlli, OCT4 tlli_old optional, RoutingAreaIdentificationV ra optional, - BssgpCellId bssgp_cell_id, + BssgpCellIds bssgp_cell_id, AuthVector vec optional, SGSN_ConnHdlrNetworkPars net, float t_guard }; -private function f_init_gb(inout GbInstance gb, charstring id) runs on test_CT { - gb.vc_NS := NS_CT.create(id & "-NS"); - gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP"); +private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { + gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)); + gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)); /* connect lower end of BSSGP emulation with NS upper port */ connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); /* connect lower end of NS emulation to NS codec port (on top of IPL4) */ @@ -224,7 +227,9 @@ sgsn_role := false }; - f_init_gb(g_gb[0], "SGSN_Test-Gb0"); + f_init_gb(g_gb[0], "SGSN_Test-Gb0", 0); + f_init_gb(g_gb[1], "SGSN_Test-Gb1", 1); + f_init_gb(g_gb[2], "SGSN_Test-Gb2", 2); f_init_gsup("SGSN_Test"); f_init_gtp("SGSN_Test"); f_init_vty(); @@ -234,7 +239,7 @@ type function void_fn(charstring id) runs on BSSGP_ConnHdlr; /* helper function to create, connect and start a BSSGP_ConnHdlr component */ -function f_start_handler(void_fn fn, charstring id, GbInstance gb, integer imsi_suffix, +function f_start_handler(void_fn fn, charstring id, GbInstances gb, integer imsi_suffix, float t_guard := 30.0) runs on test_CT return BSSGP_ConnHdlr { var BSSGP_ConnHdlr vc_conn; @@ -252,15 +257,19 @@ tlli := f_gprs_tlli_random(), tlli_old := omit, ra := omit, - bssgp_cell_id := gb.cfg.cell_id, + bssgp_cell_id := { gb[0].cfg.cell_id, gb[1].cfg.cell_id, gb[2].cfg.cell_id }, vec := omit, net := net_pars, t_guard := t_guard }; vc_conn := BSSGP_ConnHdlr.create(id); - connect(vc_conn:BSSGP[0], gb.vc_BSSGP:BSSGP_SP); - connect(vc_conn:BSSGP_PROC[0], gb.vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[0], gb[0].vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[0], gb[0].vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[1], gb[1].vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[1], gb[1].vc_BSSGP:BSSGP_PROC); + connect(vc_conn:BSSGP[2], gb[2].vc_BSSGP:BSSGP_SP); + connect(vc_conn:BSSGP_PROC[2], gb[2].vc_BSSGP:BSSGP_PROC); connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); @@ -286,7 +295,7 @@ g_pars := pars; /* register with BSSGP core */ - f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); /* tell GTP dispatcher to send this IMSI to us */ @@ -417,9 +426,9 @@ function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr { /* mandatory IE */ var hexstring aa_plmn := f_RAI_to_plmn_hexstr(aa.routingAreaIdentification); - if (not (g_pars.bssgp_cell_id.ra_id.lai.mcc_mnc == aa_plmn)) { + if (not (g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc == aa_plmn)) { setverdict(fail, "mismatching PLMN in Attach Accept: " & hex2str(aa_plmn) - & "; expected " & hex2str(g_pars.bssgp_cell_id.ra_id.lai.mcc_mnc)); + & "; expected " & hex2str(g_pars.bssgp_cell_id[0].ra_id.lai.mcc_mnc)); mtc.stop; } g_pars.ra := aa.routingAreaIdentification; @@ -524,7 +533,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], 1); + vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 1); vc_conn.done; } @@ -532,7 +541,7 @@ var BSSGP_ConnHdlr vc_conn; f_init('023042'H); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], 1001); + vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, 1001); vc_conn.done; } @@ -544,7 +553,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), testcasename(), g_gb[0], 1002); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), testcasename(), g_gb, 1002); vc_conn.done; } @@ -556,7 +565,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), testcasename(), g_gb[0], 1003); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), testcasename(), g_gb, 1003); vc_conn.done; } @@ -582,7 +591,7 @@ testcase TC_attach_auth_id_timeout() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_auth_id_timeout), testcasename(), g_gb[0], 2, 40.0); + vc_conn := f_start_handler(refers(f_TC_attach_auth_id_timeout), testcasename(), g_gb, 2, 40.0); vc_conn.done; } @@ -602,7 +611,7 @@ testcase TC_attach_auth_sai_timeout() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_timeout), testcasename(), g_gb[0], 3); + vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_timeout), testcasename(), g_gb, 3); vc_conn.done; } @@ -623,7 +632,7 @@ testcase TC_attach_auth_sai_reject() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_reject), testcasename(), g_gb[0], 4); + vc_conn := f_start_handler(refers(f_TC_attach_auth_sai_reject), testcasename(), g_gb, 4); vc_conn.done; } @@ -652,7 +661,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_timeout), testcasename(), g_gb[0], 5); + vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_timeout), testcasename(), g_gb, 5); vc_conn.done; } @@ -682,7 +691,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_reject), testcasename(), g_gb[0], 6); + vc_conn := f_start_handler(refers(f_TC_attach_gsup_lu_reject), testcasename(), g_gb, 6); vc_conn.done; } @@ -707,7 +716,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_combined), testcasename(), g_gb[0], 7); + vc_conn := f_start_handler(refers(f_TC_attach_combined), testcasename(), g_gb, 7); vc_conn.done; } @@ -731,7 +740,7 @@ f_init(); f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "auth-policy accept-all"); - vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb[0], 8); + vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb, 8); vc_conn.done; } @@ -741,7 +750,7 @@ /* Simulate a foreign IMSI */ g_pars.imsi := '001010123456789'H; - f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); g_pars.net.expect_auth := false; @@ -766,10 +775,10 @@ f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "auth-policy closed"); /* test with foreign IMSI: Must Reject */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb[0], 9); + vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb, 9); vc_conn.done; /* test with home IMSI: Must Accept */ - vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb[0], 10); + vc_conn := f_start_handler(refers(f_TC_attach_accept_all), testcasename(), g_gb, 10); vc_conn.done; } @@ -790,7 +799,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_rau_unknown), testcasename(), g_gb[0], 11); + vc_conn := f_start_handler(refers(f_TC_rau_unknown), testcasename(), g_gb, 11); vc_conn.done; } @@ -819,7 +828,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_rau), testcasename(), g_gb[0], 12); + vc_conn := f_start_handler(refers(f_TC_attach_rau), testcasename(), g_gb, 12); vc_conn.done; } @@ -864,7 +873,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_unknown_nopoweroff), testcasename(), g_gb[0], 13); + vc_conn := f_start_handler(refers(f_TC_detach_unknown_nopoweroff), testcasename(), g_gb, 13); vc_conn.done; } @@ -876,7 +885,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_unknown_poweroff), testcasename(), g_gb[0], 14); + vc_conn := f_start_handler(refers(f_TC_detach_unknown_poweroff), testcasename(), g_gb, 14); vc_conn.done; } @@ -891,7 +900,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_nopoweroff), testcasename(), g_gb[0], 15); + vc_conn := f_start_handler(refers(f_TC_detach_nopoweroff), testcasename(), g_gb, 15); vc_conn.done; } @@ -906,7 +915,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_detach_poweroff), testcasename(), g_gb[0], 16); + vc_conn := f_start_handler(refers(f_TC_detach_poweroff), testcasename(), g_gb, 16); vc_conn.done; } @@ -1196,7 +1205,7 @@ testcase TC_attach_pdp_act() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act), testcasename(), g_gb[0], 17); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act), testcasename(), g_gb, 17); vc_conn.done; } @@ -1224,7 +1233,7 @@ testcase TC_pdp_act_unattached() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_pdp_act_unattached), testcasename(), g_gb[0], 18); + vc_conn := f_start_handler(refers(f_TC_pdp_act_unattached), testcasename(), g_gb, 18); vc_conn.done; } @@ -1243,7 +1252,7 @@ testcase TC_attach_pdp_act_user() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user), testcasename(), g_gb[0], 19); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user), testcasename(), g_gb, 19); vc_conn.done; } @@ -1262,7 +1271,7 @@ testcase TC_attach_pdp_act_ggsn_reject() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_ggsn_reject), testcasename(), g_gb[0], 20); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_ggsn_reject), testcasename(), g_gb, 20); vc_conn.done; } @@ -1283,7 +1292,7 @@ testcase TC_attach_pdp_act_user_deact_mo() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mo), testcasename(), g_gb[0], 21); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mo), testcasename(), g_gb, 21); vc_conn.done; } @@ -1304,7 +1313,7 @@ testcase TC_attach_pdp_act_user_deact_mt() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mt), testcasename(), g_gb[0], 22); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_deact_mt), testcasename(), g_gb, 22); vc_conn.done; } @@ -1323,7 +1332,7 @@ testcase TC_attach_second_attempt() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 22); + vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb, 22); vc_conn.done; } @@ -1363,7 +1372,7 @@ var BSSGP_ConnHdlr vc_conn; g_use_echo := true f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_echo), testcasename(), g_gb[0], 23, 30.0); + vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_echo), testcasename(), g_gb, 23, 30.0); vc_conn.done; g_use_echo := false } @@ -1403,7 +1412,7 @@ testcase TC_attach_restart_ctr_create() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_create), testcasename(), g_gb[0], 24, 30.0); + vc_conn := f_start_handler(refers(f_TC_attach_restart_ctr_create), testcasename(), g_gb, 24, 30.0); vc_conn.done; } @@ -1439,7 +1448,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_mt_t3395_expire), testcasename(), g_gb[0], 25, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_deact_mt_t3395_expire), testcasename(), g_gb, 25, 60.0); vc_conn.done; } @@ -1487,7 +1496,7 @@ testcase TC_attach_pdp_act_user_error_ind_ggsn() runs on test_CT { var BSSGP_ConnHdlr vc_conn; f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_error_ind_ggsn), testcasename(), g_gb[0], 26); + vc_conn := f_start_handler(refers(f_TC_attach_pdp_act_user_error_ind_ggsn), testcasename(), g_gb, 26); vc_conn.done; } @@ -1499,7 +1508,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_update), testcasename(), g_gb[0], 31); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_update), testcasename(), g_gb, 31); vc_conn.done; } @@ -1530,7 +1539,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_withdraw), testcasename(), g_gb[0], 29); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_withdraw), testcasename(), g_gb, 29); vc_conn.done; } @@ -1560,7 +1569,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw), testcasename(), g_gb[0], 30); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw), testcasename(), g_gb, 30); vc_conn.done; } @@ -1576,7 +1585,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_update), testcasename(), g_gb[0], 30); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_update), testcasename(), g_gb, 30); vc_conn.done; } @@ -1595,7 +1604,7 @@ var charstring imsi := hex2str(f_gen_imsi(id)); f_init(); - vc_conn := f_start_handler(refers(f_TC_attach_detach_check_subscriber_list), testcasename(), g_gb[0], id); + vc_conn := f_start_handler(refers(f_TC_attach_detach_check_subscriber_list), testcasename(), g_gb, id); vc_conn.done; f_vty_transceive_not_match(SGSNVTY, "show subscriber cache", pattern "* IMSI: {imsi}*"); @@ -1642,7 +1651,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_no_imei_response), testcasename(), g_gb[0], 32, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_no_imei_response), testcasename(), g_gb, 32, 60.0); vc_conn.done; } @@ -1690,7 +1699,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_no_imsi_response), testcasename(), g_gb[0], 35, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_no_imsi_response), testcasename(), g_gb, 35, 60.0); vc_conn.done; } @@ -1708,7 +1717,7 @@ f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], id); + vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb, id); vc_conn.done; f_vty_transceive_match(SGSNVTY, "show subscriber cache", pattern "* IMSI: {imsi}*"); @@ -1723,7 +1732,7 @@ f_bssgp_client_unregister(g_pars.imsi); /* Simulate a foreign IMSI */ g_pars.imsi := '001010123456789'H; - f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id); + f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* there is no auth */ g_pars.net.expect_auth := false; @@ -1762,11 +1771,11 @@ f_vty_config(SGSNVTY, "sgsn", "auth-policy closed"); f_vty_config(SGSNVTY, "sgsn", "imsi-acl del 001010123456789"); /* test with foreign IMSI: Must Reject */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb[0], 9); + vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb, 9); vc_conn.done; f_vty_config(SGSNVTY, "sgsn", "imsi-acl add 001010123456789"); /* test with same IMSI: Must Accept */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_imsi_added), testcasename(), g_gb[0], 10); + vc_conn := f_start_handler(refers(f_TC_attach_closed_imsi_added), testcasename(), g_gb, 10); vc_conn.done; } @@ -1803,7 +1812,7 @@ var BSSGP_ConnHdlr vc_conn; f_init(); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_TC_attach_check_complete_resend), testcasename(), g_gb[0], 36, 60.0); + vc_conn := f_start_handler(refers(f_TC_attach_check_complete_resend), testcasename(), g_gb, 36, 60.0); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/10378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I01d7f264a0a52e248d6e754485c807266c0b14bf Gerrit-Change-Number: 10378 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce f_routing_area_update() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10379 ) Change subject: sgsn: introduce f_routing_area_update() ...................................................................... sgsn: introduce f_routing_area_update() Will be used by future RAU tests Change-Id: I4064e013f73319f24bb893a9047c8b9eb7d6aac2 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 21 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 3616a62..336f38e 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -809,20 +809,8 @@ /* first perform regular attach */ f_TC_attach(id); - /* then send RAU */ - BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); - alt { - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { - f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); - BSSGP[0].send(ts_GMM_RAU_COMPL); - setverdict(pass); - } - [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { - setverdict(fail, "Unexpected RAU Reject"); - mtc.stop; - } - [] BSSGP[0].receive { repeat; } - } + f_routing_area_update(g_pars.ra); + } testcase TC_attach_rau() runs on test_CT { var BSSGP_ConnHdlr vc_conn; @@ -1816,6 +1804,25 @@ vc_conn.done; } +private function f_routing_area_update(RoutingAreaIdentificationV ra, integer bssgp := 0) runs on BSSGP_ConnHdlr { + var BssgpDecoded bd; + + /* then send RAU */ + BSSGP[bssgp].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); + alt { + [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { + f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); + BSSGP[bssgp].send(ts_GMM_RAU_COMPL); + setverdict(pass); + } + [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { + setverdict(fail, "Unexpected RAU Reject"); + mtc.stop; + } + [] BSSGP[bssgp].receive { repeat; } + } +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); -- To view, visit https://gerrit.osmocom.org/10379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4064e013f73319f24bb893a9047c8b9eb7d6aac2 Gerrit-Change-Number: 10379 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: add type record LLC_Entities In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10382 ) Change subject: BSSGP_Emulation: add type record LLC_Entities ...................................................................... BSSGP_Emulation: add type record LLC_Entities In prepartion of moving the LLC layer out of the BSSGP Change-Id: I1a8c6a608c84a984e542510482bbfc5394ae6658 --- M library/BSSGP_Emulation.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index a9d2a25..ca97ccd 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -116,6 +116,8 @@ var ClientEntity ClientTable[16]; } +type record length(16) of LLC_Entity LLC_Entities; + type record ClientEntity { OCT4 tlli, OCT4 tlli_old optional, -- To view, visit https://gerrit.osmocom.org/10382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1a8c6a608c84a984e542510482bbfc5394ae6658 Gerrit-Change-Number: 10382 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add f_cellid_to_RAI() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10381 ) Change subject: sgsn: add f_cellid_to_RAI() ...................................................................... sgsn: add f_cellid_to_RAI() Returns a RoutingAreaIdentificationV from GbInstance. This will be useful when using multiple BSSGP and the g_pars.ra field is not the needed ra. Change-Id: Ide96213ab2f210590b86deaf370486c8a0a78058 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index b55da88..6d91738 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -110,6 +110,22 @@ float t_guard }; +private function f_cellid_to_RAI(in BssgpCellId cell_id) return RoutingAreaIdentificationV { + var BcdMccMnc mcc_mnc := cell_id.ra_id.lai.mcc_mnc; + + var RoutingAreaIdentificationV ret := { + mccDigit1 := mcc_mnc[0], + mccDigit2 := mcc_mnc[1], + mccDigit3 := mcc_mnc[2], + mncDigit3 := mcc_mnc[5], + mncDigit1 := mcc_mnc[3], + mncDigit2 := mcc_mnc[4], + lac := int2oct(cell_id.ra_id.lai.lac, 16), + rac := int2oct(cell_id.ra_id.rac, 8) + } + return ret; +}; + private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)); gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)); -- To view, visit https://gerrit.osmocom.org/10381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ide96213ab2f210590b86deaf370486c8a0a78058 Gerrit-Change-Number: 10381 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: introduce TC_attach_rau_a_a() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10380 ) Change subject: sgsn: introduce TC_attach_rau_a_a() ...................................................................... sgsn: introduce TC_attach_rau_a_a() MS <-> SGSN: Successful Attach MS -> SGSN: Routing Area Update Request MS <- SGSN: Routing Area Update Accept MS -> SGSN: Routing Area Update Request MS <- SGSN: Routing Area Update Accept MS -> SGSN: Detach (PowerOff) Change-Id: Id76b4792c07816bcbe5e965f23c2b526df0923c3 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 336f38e..b55da88 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1823,6 +1823,36 @@ } } +private function f_TC_attach_rau_a_a(charstring id) runs on BSSGP_ConnHdlr { + var BssgpDecoded bd; + + /* first perform regular attach */ + f_TC_attach(id); + + /* then send RAU */ + f_routing_area_update(g_pars.ra); + + /* do another RAU */ + f_routing_area_update(g_pars.ra); + + f_detach_mo(c_GMM_DTT_MO_GPRS, true, true); +} + +testcase TC_attach_rau_a_a() runs on test_CT { + /* MS <-> SGSN: Successful Attach + * MS -> SGSN: Routing Area Update Request + * MS <- SGSN: Routing Area Update Accept + * MS -> SGSN: Routing Area Update Request + * MS <- SGSN: Routing Area Update Accept + * MS -> SGSN: Detach (PowerOff) + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_rau_a_a), testcasename(), g_gb, 37); + vc_conn.done; +} + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1848,6 +1878,7 @@ execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 10.0 ); execute( TC_rau_unknown() ); execute( TC_attach_rau() ); + execute( TC_attach_rau_a_a() ); execute( TC_detach_unknown_nopoweroff() ); execute( TC_detach_unknown_poweroff() ); execute( TC_detach_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/10380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id76b4792c07816bcbe5e965f23c2b526df0923c3 Gerrit-Change-Number: 10380 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: move LLC layer out of BSSGP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10383 ) Change subject: BSSGP_Emulation: move LLC layer out of BSSGP ...................................................................... BSSGP_Emulation: move LLC layer out of BSSGP The LLC layer needs to be accessed by the SGSN tests in order to do multi-BSSGP tests. Otherwise the sgsn will see LLC frame with wrong sequence numbers and drop them. Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 --- M library/BSSGP_Emulation.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 54 insertions(+), 35 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index ca97ccd..c650fd5 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -136,6 +136,14 @@ uint9_t n_u_rx_last optional }; +function f_llc_create(boolean sgsn_role := false) return LLC_Entities { + var LLC_Entities llc; + for (var integer i := 0; i < 16; i := i+1) { + llc[i] := valueof(t_LLC_init(sgsn_role)); + } + return llc; +} + private template LLC_Entity t_LLC_init(boolean sgsn_role := false) := { sgsn_role := sgsn_role, n_u_tx_next := 0, @@ -576,13 +584,13 @@ } } -private function f_llc_get_n_u_tx(inout LLC_Entity llc) return uint9_t { +function f_llc_get_n_u_tx(inout LLC_Entity llc) return uint9_t { var uint9_t ret := llc.n_u_tx_next; llc.n_u_tx_next := llc.n_u_tx_next + 1; return ret; } -private function f_llc_sapi_by_l3_mo(PDU_L3_MS_SGSN l3_mo) return BIT4 { +function f_llc_sapi_by_l3_mo(PDU_L3_MS_SGSN l3_mo) return BIT4 { if (ischosen(l3_mo.msgs.gprs_mm)) { return c_LLC_SAPI_LLGMM; } else if (ischosen(l3_mo.msgs.gprs_sm)) { diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 6d91738..715bdcc 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -82,6 +82,7 @@ type component BSSGP_ConnHdlr extends BSSGP_Client_CT, GSUP_ConnHdlr, GTP_ConnHdlr { var BSSGP_ConnHdlrPars g_pars; timer g_Tguard; + var LLC_Entities llc; } type record SGSN_ConnHdlrNetworkPars { @@ -310,6 +311,8 @@ /* do some common stuff like setting up g_pars */ g_pars := pars; + llc := f_llc_create(false); + /* register with BSSGP core */ f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* tell GSUP dispatcher to send this IMSI to us */ @@ -344,16 +347,24 @@ f_sleep(20.0); } +function f_send_l3_gmm_llc(template PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr { + var octetstring l3_enc := enc_PDU_L3_MS_SGSN(valueof(l3_mo)); + var BIT4 sapi := f_llc_sapi_by_l3_mo(valueof(l3_mo)); + var integer n_u := f_llc_get_n_u_tx(llc[bit2int(sapi)]); + var octetstring llc_enc := enc_PDU_LLC(valueof(ts_LLC_UI(l3_enc, sapi, '0'B, n_u))); + BSSGP[gb_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[gb_index], llc_enc)); +} + altstep as_mm_identity() runs on BSSGP_ConnHdlr { var MobileL3_CommonIE_Types.MobileIdentityLV mi; [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; } } @@ -422,7 +433,7 @@ l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H)); } - BSSGP[0].send(l3_mo); + f_send_l3_gmm_llc(l3_mo); } else { /* wait for identity procedure */ f_sleep(1.0); @@ -528,7 +539,7 @@ * revisionLevelIndicatior is at the wrong place! */ attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; - BSSGP[0].send(attach_req); + f_send_l3_gmm_llc(attach_req); f_gmm_auth(umts_aka_challenge, force_gsm_sres); /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -537,7 +548,7 @@ f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); } private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { @@ -589,7 +600,7 @@ private function f_TC_attach_auth_id_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) { /* don't send ID Response */ @@ -615,7 +626,7 @@ private function f_TC_attach_auth_sai_timeout(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { } @@ -635,7 +646,7 @@ private function f_TC_attach_auth_sai_reject(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { @@ -657,7 +668,7 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); @@ -686,7 +697,7 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { @@ -717,7 +728,7 @@ var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit)); f_gmm_auth(); /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -725,7 +736,7 @@ BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_combined() runs on test_CT { @@ -743,12 +754,12 @@ g_pars.net.expect_auth := false; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); } - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); } testcase TC_attach_accept_all() runs on test_CT { @@ -770,7 +781,7 @@ g_pars.net.expect_auth := false; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); alt { [] as_mm_identity(); [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('07'O))) { @@ -802,7 +813,7 @@ private function f_TC_rau_unknown(charstring id) runs on BSSGP_ConnHdlr { var RoutingAreaIdentificationV old_ra := f_random_RAI(); - BSSGP[0].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT('0a'O))) { setverdict(pass); @@ -840,7 +851,7 @@ function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; timer T := 5.0; - BSSGP[0].send(ts_GMM_DET_REQ_MO(detach_type, power_off)); + f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off)); if (expect_purge) { GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS)); GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi)); @@ -967,7 +978,7 @@ recovery := ts_Recovery(apars.ggsn_restart_ctr); } - BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + f_send_l3_gmm_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud { f_process_gtp_ctx_act_req(apars, g_ud.gtpc); @@ -1002,7 +1013,7 @@ var boolean exp_rej := ispresent(apars.exp_rej_cause); var Gtp1cUnitdata g_ud; - BSSGP[0].send(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit)); GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud { var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber); BSSGP[0].clear; @@ -1033,7 +1044,7 @@ alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true))) { - BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); } [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) { repeat; @@ -1216,7 +1227,7 @@ /* PDP Context activation for not-attached subscriber; expect fail */ private function f_TC_pdp_act_unattached(charstring id) runs on BSSGP_ConnHdlr { var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); - BSSGP[0].send(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, + f_send_l3_gmm_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr, apars.apn, apars.pco)); alt { /* We might want toalso actually expect a PDPC CTX ACT REJ? */ @@ -1364,7 +1375,7 @@ var OCT1 cause_network_failure := int2oct(38, 1) alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true))) { - BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } [] as_xid(apars); @@ -1445,7 +1456,7 @@ GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {} - BSSGP[0].send(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); + f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid)); setverdict(pass); } testcase TC_attach_pdp_act_deact_mt_t3395_expire() runs on test_CT { @@ -1528,7 +1539,7 @@ /* MS: receive a Detach Request */ BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); - BSSGP[0].send(ts_GMM_DET_ACCEPT_MO); + f_send_l3_gmm_llc(ts_GMM_DET_ACCEPT_MO); setverdict(pass); } @@ -1619,7 +1630,7 @@ var integer count_req := 0; var MobileL3_CommonIE_Types.MobileIdentityLV mi; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { @@ -1627,7 +1638,7 @@ } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('001'B))) { mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { @@ -1667,7 +1678,7 @@ /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */ g_pars.p_tmsi := 'c0000035'O; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { @@ -1680,7 +1691,7 @@ } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ID_REQ('010'B))) { mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); - BSSGP[0].send(ts_GMM_ID_RESP(mi)); + f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi)); repeat; } } @@ -1741,7 +1752,7 @@ /* there is no auth */ g_pars.net.expect_auth := false; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); f_gmm_auth(); alt { [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) { @@ -1750,7 +1761,7 @@ } [] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(*, *, *))) -> value bd { f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept); - BSSGP[0].send(ts_GMM_ATTACH_COMPL); + f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL); setverdict(pass); } } @@ -1787,7 +1798,7 @@ private function f_TC_attach_check_complete_resend(charstring id) runs on BSSGP_ConnHdlr { var integer count_req := 0; - BSSGP[0].send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit)); f_gmm_auth(); alt { @@ -1824,11 +1835,11 @@ var BssgpDecoded bd; /* then send RAU */ - BSSGP[bssgp].send(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit)); + f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp); alt { [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); - BSSGP[bssgp].send(ts_GMM_RAU_COMPL); + f_send_l3_gmm_llc(ts_GMM_RAU_COMPL, bssgp); setverdict(pass); } [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { -- To view, visit https://gerrit.osmocom.org/10383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie9e9d7da0a78a96f4f431c9085b9e273a39535f1 Gerrit-Change-Number: 10383 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: dont fail when removing a non-exitent client In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10385 ) Change subject: BSSGP_Emulation: dont fail when removing a non-exitent client ...................................................................... BSSGP_Emulation: dont fail when removing a non-exitent client On multiple BSSGP tests the IMSI might not anymore registered to the first BSSGP Change-Id: Ibad8971e5acc2691da29cf7fa394d1d58eea79a4 --- M library/BSSGP_Emulation.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index ea242d3..fa33f51 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -321,8 +321,8 @@ return; } } - setverdict(fail, "Could not find client for IMSI ", imsi); - mtc.stop; + log("Warning: Could not find client for IMSI ", imsi); + return; } /* TS 44.064 7.2.1.1 LLGMM-ASSIGN */ -- To view, visit https://gerrit.osmocom.org/10385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibad8971e5acc2691da29cf7fa394d1d58eea79a4 Gerrit-Change-Number: 10385 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:26:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:26:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10384 ) Change subject: BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) ...................................................................... BSSGP_Emulation: remove unused BSSGP_SP.receive(PDU_L3_MS_SGSN) As the llc is handled outside, this function is not anymore needed Change-Id: Ib910dec4a54e155573c162a70731f20cbf1e9c5d --- M library/BSSGP_Emulation.ttcn 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index c650fd5..ea242d3 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -560,14 +560,6 @@ BSCP.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); } - [not g_cfg.sgsn_role] BSSGP_SP.receive(PDU_L3_MS_SGSN:?) -> value l3_mo sender vc_conn { - var integer idx := f_tbl_idx_by_comp(vc_conn); - var octetstring l3_enc := enc_PDU_L3_MS_SGSN(l3_mo); - var BIT4 sapi := f_llc_sapi_by_l3_mo(l3_mo); - var integer n_u := f_llc_get_n_u_tx(ClientTable[idx].llc[bit2int(sapi)]); - var octetstring llc_enc := enc_PDU_LLC(valueof(ts_LLC_UI(l3_enc, sapi, '0'B, n_u))); - BSCP.send(f_BnsUdReq(ts_BSSGP_UL_UD(ClientTable[idx].tlli, ClientTable[idx].cell_id, llc_enc), g_cfg.bvci)); - } [g_cfg.sgsn_role] BSSGP_SP.receive(PDU_L3_SGSN_MS:?) -> value l3_mt sender vc_conn { var integer idx := f_tbl_idx_by_comp(vc_conn); var octetstring l3_enc := enc_PDU_L3_SGSN_MS(l3_mt); -- To view, visit https://gerrit.osmocom.org/10384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib910dec4a54e155573c162a70731f20cbf1e9c5d Gerrit-Change-Number: 10384 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:27:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:27:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_clien... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10386 ) Change subject: sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 Gerrit-Change-Number: 10386 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 13:27:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:28:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 13:28:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10392 ) Change subject: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10392/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10392/3//COMMIT_MSG at 10 PS3, Line 10: Attach Request should this read "Attach Complete"? -- To view, visit https://gerrit.osmocom.org/10392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 Gerrit-Change-Number: 10392 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 14 Aug 2018 13:28:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 13:34:42 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 14 Aug 2018 13:34:42 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#10). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_gmm_attach.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 9 files changed, 475 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/10 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 14 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 14 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#215?= In-Reply-To: <2106734407.193.1534173006096.JavaMail.jenkins@jenkins.osmocom.org> References: <2106734407.193.1534173006096.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2056298455.211.1534259406204.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Aug 14 16:37:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 14 Aug 2018 16:37:33 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binariDrop binaries provided by other recipes Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10451 Change subject: openbsc: Drop binariDrop binaries provided by other recipes ...................................................................... openbsc: Drop binariDrop binaries provided by other recipes Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/51/10451/1 diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 9f23d52..892fab9 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -36,6 +36,18 @@ install -d ${D}/var/lib/osmocom + # osmo-bsc_mgcp is provided by osmo-mgw.bb + rm ${D}${bindir}/osmo-bsc_mgcp + + # provided by osmo-bsc.bb: + rm ${D}${bindir}/ipaccess-config + rm ${D}${bindir}/ipaccess-proxy + rm ${D}${bindir}/osmo-meas-udp2db + rm ${D}${bindir}/isdnsync + rm ${D}${bindir}/bs11_config + rm ${D}${bindir}/abisip-find + rm ${D}${bindir}/meas_json + rm ${D}${bindir}/osmo-meas-pcap2db } PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" -- To view, visit https://gerrit.osmocom.org/10451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 Gerrit-Change-Number: 10451 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 16:38:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 14 Aug 2018 16:38:22 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binaries provided by other recipes In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10451 ) Change subject: openbsc: Drop binaries provided by other recipes ...................................................................... openbsc: Drop binaries provided by other recipes Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 --- M recipes-osmocom/openbsc/openbsc.inc 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/51/10451/2 -- To view, visit https://gerrit.osmocom.org/10451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newpatchset Gerrit-Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 Gerrit-Change-Number: 10451 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 16:38:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 14 Aug 2018 16:38:39 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binaries provided by other recipes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10451 ) Change subject: openbsc: Drop binaries provided by other recipes ...................................................................... Patch Set 2: validation in progress (201705-testbranch/49). -- To view, visit https://gerrit.osmocom.org/10451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 Gerrit-Change-Number: 10451 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 14 Aug 2018 16:38:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 16:57:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 14 Aug 2018 16:57:37 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binaries provided by other recipes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10451 ) Change subject: openbsc: Drop binaries provided by other recipes ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/10451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 Gerrit-Change-Number: 10451 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 14 Aug 2018 16:57:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 20:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 14 Aug 2018 20:49:52 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binaries provided by other recipes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10451 ) Change subject: openbsc: Drop binaries provided by other recipes ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc File recipes-osmocom/openbsc/openbsc.inc: https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc at 39 PS2, Line 39: osmo-bsc_mgcp is provided by osmo-mgw.bb are you sure about this? If so, it is IMHO actually a bug. osmo-mgw.git should only build libosmo-mgcp-* and osmo-mgw. osmo-bsc_mgcp is the legacy program which belongs into openbsc.git. https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc at 42 PS2, Line 42: provided by osmo-bsc.bb can they all be installed separately without installing/depending on osmo-bsc? After all, if you run osmonitb or osmo-sccp-lite, then that's mutually exclusive to osmo-bsc -- To view, visit https://gerrit.osmocom.org/10451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 Gerrit-Change-Number: 10451 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 14 Aug 2018 20:49:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 14 21:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?Tobias_M=C3=A4del?=) Date: Tue, 14 Aug 2018 21:10:44 +0000 Subject: Change in osmo-sip-connector[master]: merges commit from lynxis - changes byte order for IPv4 address in SDP Message-ID: Tobias M?del has uploaded this change for review. ( https://gerrit.osmocom.org/10452 Change subject: merges commit from lynxis - changes byte order for IPv4 address in SDP ...................................................................... merges commit from lynxis - changes byte order for IPv4 address in SDP Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 --- M src/sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/52/10452/1 diff --git a/src/sdp.c b/src/sdp.c index 213e979..2824378 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -165,7 +165,7 @@ char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other) { - struct in_addr net = { .s_addr = ntohl(other->ip) }; + struct in_addr net = { .s_addr = other->ip }; char *fmtp_str = NULL, *sdp; leg->wanted_codec = app_media_name(other->payload_msg_type); -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 1 Gerrit-Owner: Tobias M?del -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 00:21:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 00:21:58 +0000 Subject: Change in osmo-sip-connector[master]: merges commit from lynxis - changes byte order for IPv4 address in SDP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: merges commit from lynxis - changes byte order for IPv4 address in SDP ...................................................................... Patch Set 1: Code-Review-1 I think it would be better to have the original commit description "sdp: remove htonl() from in_addr" and the actual author of this change. -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 1 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 15 Aug 2018 00:21:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 00:24:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 00:24:32 +0000 Subject: Change in osmo-sip-connector[master]: merges commit from lynxis - changes byte order for IPv4 address in SDP In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: merges commit from lynxis - changes byte order for IPv4 address in SDP ...................................................................... Patch Set 1: You can take the author creds from: https://gerrit.osmocom.org/10385/ -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 1 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 15 Aug 2018 00:24:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:02 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10453 Change subject: trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* ...................................................................... trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* Change-Id: Ifa7d9f806b3f18f2dfec931252f5119441b30e8a --- M src/host/trxcon/sched_trx.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/53/10453/1 diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 17e30bf..cd9c0e4 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -296,10 +296,10 @@ (trx_lchan_desc[chan].link_id & TRX_CH_LID_SACCH) #define PRIM_IS_TCH(prim) \ - CHAN_IS_TCH(prim->chan) && prim->payload_len != GSM_MACBLOCK_LEN + (CHAN_IS_TCH(prim->chan) && prim->payload_len != GSM_MACBLOCK_LEN) #define PRIM_IS_FACCH(prim) \ - CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN + (CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN) struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, enum trx_lchan_type lchan_type); -- To view, visit https://gerrit.osmocom.org/10453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa7d9f806b3f18f2dfec931252f5119441b30e8a Gerrit-Change-Number: 10453 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:03 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: refactor prim dequeuing logic Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10454 Change subject: trxcon/sched_prim.c: refactor prim dequeuing logic ...................................................................... trxcon/sched_prim.c: refactor prim dequeuing logic The previous primitive dequeuing logic (especially for TCH/F channels) was a bit complicated, and it could not be possible to reuse the existing code parts in the upcoming implementation of both TCH/H and FACCH/H channels without changing anything. In particular, this change introduces two internal functions: - prim_dequeue_one(), which merely dequeues a primitive of a given channel type (e.g. TRXC_SDCCH4_0); - prim_dequeue_tch(), which dequeues either a FACCH, or a speech TCH primitive of a given channel type (Lm or Bm). So the logic of the TCH/F prim dequeuing function has become cleaner, and the upcoming TCH/H prim dequeuing function, where FACCH/H prioritization is more complex than FACCH/F, will reuse the introduced functions. Change-Id: Ib82ad2480ab1bc6b1df9576eb2bf5acbd398bf66 --- M src/host/trxcon/sched_prim.c 1 file changed, 82 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/10454/1 diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 2ee06d7..4987379 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -128,61 +128,98 @@ return 0; } +/* Dequeues a primitive of a given channel type */ +static struct trx_ts_prim *prim_dequeue_one(struct llist_head *queue, + enum trx_lchan_type lchan_type) +{ + struct trx_ts_prim *prim; + + /** + * There is no need to use the 'safe' list iteration here + * as an item removal is immediately followed by return. + */ + llist_for_each_entry(prim, queue, list) { + if (prim->chan == lchan_type) { + llist_del(&prim->list); + return prim; + } + } + + return NULL; +} + /** - * Dequeues a TCH or FACCH frame, prioritizing the second. - * In case if a FACCH frame is found, a TCH frame is being + * Dequeues either a FACCH, or a speech TCH primitive + * of a given channel type (Lm or Bm). + * + * Note: we could avoid 'lchan_type' parameter and just + * check the prim's channel type using CHAN_IS_TCH(), + * but the current approach is a bit more flexible, + * and allows one to have both sub-slots of TCH/H + * enabled on same timeslot e.g. for testing... + * + * @param queue transmit queue to take a prim from + * @param lchan_type required channel type of a primitive, + * e.g. TRXC_TCHF, TRXC_TCHH_0, or TRXC_TCHH_1 + * @param facch FACCH (true) or speech (false) prim? + * @return either a FACCH, or a TCH primitive if found, + * otherwise NULL + */ +static struct trx_ts_prim *prim_dequeue_tch(struct llist_head *queue, + enum trx_lchan_type lchan_type, bool facch) +{ + struct trx_ts_prim *prim; + + /** + * There is no need to use the 'safe' list iteration here + * as an item removal is immediately followed by return. + */ + llist_for_each_entry(prim, queue, list) { + if (prim->chan != lchan_type) + continue; + + /* Either FACCH, or not FACCH */ + if (PRIM_IS_FACCH(prim) != facch) + continue; + + llist_del(&prim->list); + return prim; + } + + return NULL; +} + +/** + * Dequeues either a TCH/F, or a FACCH/F prim (preferred). + * If a FACCH/F prim is found, one TCH/F prim is being * dropped (i.e. replaced). * * @param queue a transmit queue to take a prim from - * @return a FACCH or TCH primitive, otherwise NULL + * @return either a FACCH/F, or a TCH/F primitive, + * otherwise NULL */ -static struct trx_ts_prim *sched_prim_dequeue_tch(struct llist_head *queue) +static struct trx_ts_prim *prim_dequeue_tch_f(struct llist_head *queue) { - struct trx_ts_prim *facch = NULL; - struct trx_ts_prim *tch = NULL; - struct trx_ts_prim *i; + struct trx_ts_prim *facch; + struct trx_ts_prim *tch; - /* Attempt to find a pair of FACCH and TCH frames */ - llist_for_each_entry(i, queue, list) { - /* Find one FACCH frame */ - if (!facch && PRIM_IS_FACCH(i)) - facch = i; + /* Attempt to find a pair of both FACCH/F and TCH/F frames */ + facch = prim_dequeue_tch(queue, TRXC_TCHF, true); + tch = prim_dequeue_tch(queue, TRXC_TCHF, false); - /* Find one TCH frame */ - if (!tch && PRIM_IS_TCH(i)) - tch = i; - - /* If both are found */ - if (facch && tch) - break; - } - - /* Prioritize FACCH */ - if (facch && tch) { - /* We found a pair, dequeue both */ - llist_del(&facch->list); - llist_del(&tch->list); - - /* Drop TCH */ - talloc_free(tch); - - /* FACCH replaces TCH */ - return facch; - } else if (facch) { - /* Only FACCH was found */ - llist_del(&facch->list); + /* Prioritize FACCH/F, if found */ + if (facch) { + /* One TCH/F prim is replaced */ + if (tch) + talloc_free(tch); return facch; } else if (tch) { - /* Only TCH was found */ - llist_del(&tch->list); + /* Only TCH/F prim was found */ return tch; + } else { + /* Nothing was found, e.g. when only SACCH frames are in queue */ + return NULL; } - - /** - * Nothing was found, - * e.g. only SACCH frames are in queue - */ - return NULL; } /** @@ -196,24 +233,15 @@ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, enum trx_lchan_type lchan_type) { - struct trx_ts_prim *prim; - /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; /* TCH requires FACCH prioritization, so handle it separately */ if (CHAN_IS_TCH(lchan_type)) - return sched_prim_dequeue_tch(queue); + return prim_dequeue_tch_f(queue); - llist_for_each_entry(prim, queue, list) { - if (prim->chan == lchan_type) { - llist_del(&prim->list); - return prim; - } - } - - return NULL; + return prim_dequeue_one(queue, lchan_type); } /** -- To view, visit https://gerrit.osmocom.org/10454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib82ad2480ab1bc6b1df9576eb2bf5acbd398bf66 Gerrit-Change-Number: 10454 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:03 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10455 Change subject: trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims ...................................................................... trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims Initially it was assumed that FACCH prioritization should be done in the same way for both TCH/F and TCH/H. Moreover, it was not possible to confirm this, because TCH/H was (and still) not implemented yet. But according to the specs: - unlike FACCH/F, FACCH/H transmissions shall be aligned within a multiframe, i.e. can only be initiated on particular frame numbers (see GSM 05.02, clause 7); - unlike FACCH/F, a FACCH/H frame steals two TCH/F frames; so the TCH/H (including FACCH/H) primitives should be handled separately from the TCH/F (including FACCH/F) primitives. Change-Id: I9b59f60e1cbac8fb8fd557b6c67b5e376c0a6bbb --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 86 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/10455/1 diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 4987379..acd08bf 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -223,25 +223,105 @@ } /** + * Dequeues either a TCH/H, or a FACCH/H prim (preferred). + * If a FACCH/H prim is found, two TCH/H prims are being + * dropped (i.e. replaced). + * + * According to GSM 05.02, the following blocks can be used + * to carry FACCH/H data (see clause 7, table 1 of 9): + * + * UL FACCH/H0: + * B0(0,2,4,6,8,10), B1(8,10,13,15,17,19), B2(17,19,21,23,0,2) + * + * UL FACCH/H1: + * B0(1,3,5,7,9,11), B1(9,11,14,16,18,20), B2(18,20,22,24,1,3) + * + * where the numbers within brackets are fn % 26. + * + * @param queue transmit queue to take a prim from + * @param fn the current frame number + * @param lchan_type required channel type of a primitive, + * @return either a FACCH/H, or a TCH/H primitive, + * otherwise NULL + */ +static struct trx_ts_prim *prim_dequeue_tch_h(struct llist_head *queue, + uint32_t fn, enum trx_lchan_type lchan_type) +{ + struct trx_ts_prim *facch; + struct trx_ts_prim *tch; + bool facch_now = false; + uint32_t fn_mf; + + /* Traffic multiframe period */ + fn_mf = fn % 26; + + /* FACCH/H0 frame alignment */ + if (lchan_type == TRXC_TCHH_0) + if (fn_mf == 0 || fn_mf == 8 || fn_mf == 17) + facch_now = true; + + /* FACCH/H1 frame alignment */ + if (lchan_type == TRXC_TCHH_1) + if (fn_mf == 1 || fn_mf == 9 || fn_mf == 18) + facch_now = true; + + /* If FACCH/H is not allowed for a given frame number */ + if (!facch_now) /* Just dequeue a TCH/H prim */ + goto no_facch; + + /* If there are no FACCH/H prims in the queue */ + facch = prim_dequeue_tch(queue, lchan_type, true); + if (!facch) /* Just dequeue a TCH/H prim */ + goto no_facch; + + /* FACCH/H prim replaces two TCH/F prims */ + tch = prim_dequeue_tch(queue, lchan_type, false); + if (tch) { + /* At least one TCH/H prim is dropped */ + talloc_free(tch); + + /* Attempt to find another */ + tch = prim_dequeue_tch(queue, lchan_type, false); + if (tch) /* Drop the second TCH/H prim */ + talloc_free(tch); + } + + return facch; + +no_facch: + return prim_dequeue_tch(queue, lchan_type, false); +} + +/** * Dequeues a single primitive of required type * from a specified transmit queue. * * @param queue a transmit queue to take a prim from + * @param fn the current frame number (used for FACCH/H) * @param lchan_type required primitive type * @return a primitive or NULL if not found */ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, - enum trx_lchan_type lchan_type) + uint32_t fn, enum trx_lchan_type lchan_type) { /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; - /* TCH requires FACCH prioritization, so handle it separately */ - if (CHAN_IS_TCH(lchan_type)) + switch (lchan_type) { + /* TCH/F requires FACCH/F prioritization */ + case TRXC_TCHF: return prim_dequeue_tch_f(queue); - return prim_dequeue_one(queue, lchan_type); + /* FACCH/H prioritization is a bit more complex */ + case TRXC_TCHH_0: + case TRXC_TCHH_1: + return prim_dequeue_tch_h(queue, fn, lchan_type); + + /* Other kinds of logical channels */ + default: + return prim_dequeue_one(queue, lchan_type); + } } /** diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index c263ce7..fd43a56 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -95,7 +95,7 @@ * attempt to obtain a new one from queue */ if (lchan->prim == NULL) - lchan->prim = sched_prim_dequeue(&ts->tx_prims, chan); + lchan->prim = sched_prim_dequeue(&ts->tx_prims, fn, chan); /* TODO: report TX buffers health to the higher layers */ diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index cd9c0e4..f3fa9df 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -302,7 +302,7 @@ (CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN) struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, - enum trx_lchan_type lchan_type); + uint32_t fn, enum trx_lchan_type lchan_type); int sched_prim_dummy(struct trx_lchan_state *lchan); void sched_prim_drop(struct trx_lchan_state *lchan); void sched_prim_flush_queue(struct llist_head *list); -- To view, visit https://gerrit.osmocom.org/10455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b59f60e1cbac8fb8fd557b6c67b5e376c0a6bbb Gerrit-Change-Number: 10455 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:03 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass lchan to sched_bad_frame_ind() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10456 Change subject: trxcon/scheduler: pass lchan to sched_bad_frame_ind() ...................................................................... trxcon/scheduler: pass lchan to sched_bad_frame_ind() Instead of passing the information about a logical channel, it makes sense to pass the pointer to its state where everything is stored. This approach would allow to avoid adding more arguments every time, e.g. in case of AMR. Change-Id: I91fe86fef43aac68776a58c9acc37ef2a9ee8042 --- M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.h 4 files changed, 10 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/10456/1 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 47b0162..03cdc67 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -139,17 +139,17 @@ * Composes a bad frame indication message * according to the current tch_mode. * - * @param l2 Pointer to allocated byte array - * @param tch_mode Current TCH mode + * @param l2 Caller-allocated byte array + * @param lchan Logical channel to generate BFI for * @return How much bytes were written */ -size_t sched_bad_frame_ind(uint8_t *l2, uint8_t rsl_cmode, uint8_t tch_mode) +size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan) { /* BFI is only required for speech */ - if (rsl_cmode != RSL_CMOD_SPD_SPEECH) + if (lchan->rsl_cmode != RSL_CMOD_SPD_SPEECH) return 0; - switch (tch_mode) { + switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* Full Rate */ memset(l2, 0x00, GSM_FR_BYTES); @@ -163,7 +163,7 @@ /* FIXME: AMR is not implemented yet */ return 0; default: - LOGP(DSCH, LOGL_ERROR, "Invalid TCH mode: %u\n", tch_mode); + LOGP(DSCH, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); return 0; } } diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index e20b461..86cdb12 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -166,7 +166,7 @@ bfi: /* Bad frame indication */ - l2_len = sched_bad_frame_ind(l2, rsl_cmode, tch_mode); + l2_len = sched_bad_frame_ind(l2, lchan); /* Didn't try to decode */ if (n_errors < 0) diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index acd08bf..2aeaa5d 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -373,12 +373,8 @@ * other channels: LAPDm fill frame. */ if (CHAN_IS_TCH(chan) && TCH_MODE_IS_SPEECH(tch_mode)) { - /** - * Silence frame indication - * HACK: use actual rsl_cmode! - */ - prim_len = sched_bad_frame_ind(prim_buffer, - RSL_CMOD_SPD_SPEECH, tch_mode); + /* Bad frame indication */ + prim_len = sched_bad_frame_ind(prim_buffer, lchan); } else if (CHAN_IS_TCH(chan) && TCH_MODE_IS_DATA(tch_mode)) { /* FIXME: should we do anything for CSD? */ return 0; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index f3fa9df..2aafbf0 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -317,7 +317,7 @@ /* Shared declarations for lchan handlers */ extern const uint8_t sched_nb_training_bits[8][26]; -size_t sched_bad_frame_ind(uint8_t *l2, uint8_t rsl_cmode, uint8_t tch_mode); +size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan); int sched_send_dt_ind(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint8_t *l2, size_t l2_len, int bit_error_count, bool dec_failed, bool traffic); -- To view, visit https://gerrit.osmocom.org/10456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I91fe86fef43aac68776a58c9acc37ef2a9ee8042 Gerrit-Change-Number: 10456 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:04 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: properly generate BFI for TCH/H Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10457 Change subject: trxcon/scheduler: fix: properly generate BFI for TCH/H ...................................................................... trxcon/scheduler: fix: properly generate BFI for TCH/H When relying on GSM 04.08 channel mode (GSM48_CMODE_*), one should distinguish between Bm (full rate) and Lm (half rate) channels. This change prevents the scheduler from generating TCH/F BFI instead of TCH/H BFI on the corresponding channels. Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46 --- M src/host/trxcon/sched_lchan_common.c 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/10457/1 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 03cdc67..76a32fe 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -151,10 +151,16 @@ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - case GSM48_CMODE_SPEECH_V1: /* Full Rate */ - memset(l2, 0x00, GSM_FR_BYTES); - l2[0] = 0xd0; - return GSM_FR_BYTES; + case GSM48_CMODE_SPEECH_V1: + if (lchan->type == TRXC_TCHF) { /* Full Rate */ + memset(l2, 0x00, GSM_FR_BYTES); + l2[0] = 0xd0; + return GSM_FR_BYTES; + } else { /* Half Rate */ + memset(l2 + 1, 0x00, GSM_HR_BYTES); + l2[0] = 0x70; /* F = 0, FT = 111 */ + return GSM_HR_BYTES + 1; + } case GSM48_CMODE_SPEECH_EFR: /* Enhanced Full Rate */ memset(l2, 0x00, GSM_EFR_BYTES); l2[0] = 0xc0; -- To view, visit https://gerrit.osmocom.org/10457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46 Gerrit-Change-Number: 10457 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:04 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: get rid of useless lchan->rsl_mode Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10458 Change subject: trxcon/scheduler: get rid of useless lchan->rsl_mode ...................................................................... trxcon/scheduler: get rid of useless lchan->rsl_mode This field of the logical channel state structure was not used at all as there is nothing related to A-bis / RSL in trxcon itself. Change-Id: Iec1abf777a74cf57deadafa95e2337cba5d02842 --- M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 5 files changed, 5 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/10458/1 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 76a32fe..2767b90 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -36,7 +36,6 @@ #include #include -#include #include "l1ctl_proto.h" #include "scheduler.h" @@ -145,10 +144,6 @@ */ size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan) { - /* BFI is only required for speech */ - if (lchan->rsl_cmode != RSL_CMOD_SPD_SPEECH) - return 0; - switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index 86cdb12..f6465f9 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -50,7 +49,6 @@ { const struct trx_lchan_desc *lchan_desc; int n_errors = -1, n_bits_total, rc; - uint8_t rsl_cmode, tch_mode, mode; sbit_t *buffer, *offset; uint8_t l2[128], *mask; uint32_t *first_fn; @@ -92,15 +90,6 @@ if (bid != 3) return 0; - /** - * Get current RSL / TCH modes - * - * FIXME: we do support speech only, and - * CSD support may be implemented latter. - */ - rsl_cmode = RSL_CMOD_SPD_SPEECH; - tch_mode = lchan->tch_mode; - /* Check for complete set of bursts */ if ((*mask & 0xf) != 0xf) { LOGP(DSCHD, LOGL_ERROR, "Received incomplete traffic frame at " @@ -113,10 +102,7 @@ goto bfi; } - mode = rsl_cmode != RSL_CMOD_SPD_SPEECH ? - GSM48_CMODE_SPEECH_V1 : tch_mode; - - switch (mode) { + switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* FR */ rc = gsm0503_tch_fr_decode(l2, buffer, @@ -134,7 +120,7 @@ LOGP(DSCHD, LOGL_ERROR, "AMR isn't supported yet\n"); return -ENOTSUP; default: - LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u\n", tch_mode); + LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); return -EINVAL; } diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 2aeaa5d..e663bc3 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -32,7 +32,6 @@ #include #include -#include #include "scheduler.h" #include "sched_trx.h" diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index fd43a56..8bd3c72 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -465,8 +465,7 @@ lchan->dl_ongoing_facch = 0; lchan->ul_ongoing_facch = 0; - lchan->rsl_cmode = 0x00; - lchan->tch_mode = 0x00; + lchan->tch_mode = GSM48_CMODE_SIGN; /* Reset AMR state */ memset(&lchan->amr, 0x00, sizeof(lchan->amr)); diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 2aafbf0..730923b 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -167,8 +167,8 @@ /*! \brief A primitive being sent */ struct trx_ts_prim *prim; - /*! \brief Mode for TCH channels */ - uint8_t rsl_cmode, tch_mode; + /*! \brief Mode for TCH channels (see GSM48_CMODE_*) */ + uint8_t tch_mode; /*! \brief FACCH/H on downlink */ uint8_t dl_ongoing_facch; -- To view, visit https://gerrit.osmocom.org/10458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec1abf777a74cf57deadafa95e2337cba5d02842 Gerrit-Change-Number: 10458 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:05 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: share FACCH/H TDMA frame mapping helpres Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10459 Change subject: trxcon/scheduler: share FACCH/H TDMA frame mapping helpres ...................................................................... trxcon/scheduler: share FACCH/H TDMA frame mapping helpres Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9 --- M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.h 3 files changed, 87 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/10459/1 diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 2767b90..4d45e66 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -168,3 +168,83 @@ return 0; } } + +/** + * May an Uplink FACCH/H transmission be initiated on + * a given frame number and a given channel type? + * + * See GSM 05.02, clause 7, table 1 + * + * @param chan channel type (TRXC_TCHH_0 or TRXC_TCHH_1) + * @param fn the current frame number + * @return true (yes) or false (no) + */ +bool sched_facch_h_ul_start(enum trx_lchan_type chan, uint32_t fn) +{ + uint32_t fn_mf; + + /* Traffic multiframe period */ + fn_mf = fn % 26; + + /** + * FACCH/H0 UL frame alignment + * B0(0,2,4,6,8,10) + * B1(8,10,13,15,17,19) + * B2(17,19,21,23,0,2) + */ + if (chan == TRXC_TCHH_0) + if (fn_mf == 0 || fn_mf == 8 || fn_mf == 17) + return true; + + /** + * FACCH/H1 UL frame alignment + * B0(1,3,5,7,9,11) + * B1(9,11,14,16,18,20) + * B2(18,20,22,24,1,3) + */ + if (chan == TRXC_TCHH_1) + if (fn_mf == 1 || fn_mf == 9 || fn_mf == 18) + return true; + + return false; +} + +/** + * May a Downlink FACCH/H transmission be finished on + * a given frame number and a given channel type? + * + * See GSM 05.02, clause 7, table 1 + * + * @param chan channel type (TRXC_TCHH_0 or TRXC_TCHH_1) + * @param fn the current frame number + * @return true (yes) or false (no) + */ +bool sched_facch_h_dl_end(enum trx_lchan_type chan, uint32_t fn) +{ + uint32_t fn_mf; + + /* Traffic multiframe period */ + fn_mf = fn % 26; + + /** + * FACCH/H0 DL frame alignment + * B0(4,6,8,10,13,15) + * B1(13,15,17,19,21,23) + * B2(21,23,0,2,4,6) + */ + if (chan == TRXC_TCHH_0) + if (fn_mf == 15 || fn_mf == 23 || fn_mf == 6) + return true; + + /** + * FACCH/H1 DL frame alignment + * B0(5,7,9,11,14,16) + * B1(14,16,18,20,22,24) + * B2(22,24,1,3,5,7) + */ + if (chan == TRXC_TCHH_1) + if (fn_mf == 16 || fn_mf == 24 || fn_mf == 7) + return true; + + return false; +} diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index e663bc3..723facb 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -248,23 +248,10 @@ { struct trx_ts_prim *facch; struct trx_ts_prim *tch; - bool facch_now = false; - uint32_t fn_mf; + bool facch_now; - /* Traffic multiframe period */ - fn_mf = fn % 26; - - /* FACCH/H0 frame alignment */ - if (lchan_type == TRXC_TCHH_0) - if (fn_mf == 0 || fn_mf == 8 || fn_mf == 17) - facch_now = true; - - /* FACCH/H1 frame alignment */ - if (lchan_type == TRXC_TCHH_1) - if (fn_mf == 1 || fn_mf == 9 || fn_mf == 18) - facch_now = true; - - /* If FACCH/H is not allowed for a given frame number */ + /* May we initiate an UL FACCH/H frame transmission now? */ + facch_now = sched_facch_h_ul_start(lchan_type, fn); if (!facch_now) /* Just dequeue a TCH/H prim */ goto no_facch; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 730923b..f8898cd 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -323,3 +323,7 @@ int bit_error_count, bool dec_failed, bool traffic); int sched_send_dt_conf(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, bool traffic); + +/* Interleaved FACCH/H block TDMA frame mapping */ +bool sched_facch_h_ul_start(enum trx_lchan_type chan, uint32_t fn); +bool sched_facch_h_dl_end(enum trx_lchan_type chan, uint32_t fn); -- To view, visit https://gerrit.osmocom.org/10459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9 Gerrit-Change-Number: 10459 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 02:46:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 02:46:06 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: add TCH/H channel support Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10460 Change subject: trxcon/scheduler: add TCH/H channel support ...................................................................... trxcon/scheduler: add TCH/H channel support Change-Id: Ibb2a0850692c5ff86b13b820af10b12085589e67 --- M src/host/trxcon/Makefile.am M src/host/trxcon/sched_lchan_desc.c A src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 5 files changed, 329 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/10460/1 diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am index c9cc170..7095cb5 100644 --- a/src/host/trxcon/Makefile.am +++ b/src/host/trxcon/Makefile.am @@ -35,6 +35,7 @@ sched_lchan_desc.c \ sched_lchan_xcch.c \ sched_lchan_tchf.c \ + sched_lchan_tchh.c \ sched_lchan_rach.c \ sched_lchan_sch.c \ sched_mframe.c \ diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c index 37d1273..4cac439 100644 --- a/src/host/trxcon/sched_lchan_desc.c +++ b/src/host/trxcon/sched_lchan_desc.c @@ -27,10 +27,7 @@ /* TODO: implement */ #define tx_pdtch_fn NULL -#define tx_tchh_fn NULL - #define rx_pdtch_fn NULL -#define rx_tchh_fn NULL /* Forward declaration of handlers */ int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts, @@ -54,6 +51,14 @@ int tx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); +int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, + sbit_t *bits, int8_t rssi, int16_t toa256); + +int tx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid); + + const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = { { TRXC_IDLE, "IDLE", diff --git a/src/host/trxcon/sched_lchan_tchh.c b/src/host/trxcon/sched_lchan_tchh.c new file mode 100644 index 0000000..678fca8 --- /dev/null +++ b/src/host/trxcon/sched_lchan_tchh.c @@ -0,0 +1,316 @@ +/* + * OsmocomBB <-> SDR connection bridge + * TDMA scheduler: handlers for DL / UL bursts on logical channels + * + * (C) 2018 by Vadim Yanitskiy + * (C) 2018 by Harald Welte + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include + +#include "l1ctl_proto.h" +#include "scheduler.h" +#include "sched_trx.h" +#include "logging.h" +#include "trx_if.h" +#include "trxcon.h" +#include "l1ctl.h" + +int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid, + sbit_t *bits, int8_t rssi, int16_t toa256) +{ + const struct trx_lchan_desc *lchan_desc; + int n_errors = -1, n_bits_total, rc; + sbit_t *buffer, *offset; + uint8_t l2[128], *mask; + uint32_t *first_fn; + bool facch_now; + size_t l2_len; + + /* Set up pointers */ + lchan_desc = &trx_lchan_desc[lchan->type]; + first_fn = &lchan->rx_first_fn; + mask = &lchan->rx_burst_mask; + buffer = lchan->rx_bursts; + + LOGP(DSCHD, LOGL_DEBUG, "Traffic received on %s: fn=%u ts=%u bid=%u\n", + lchan_desc->name, fn, ts->index, bid); + + /* Reset internal state */ + if (bid == 0) { + /* FIXME: clean up old measurements */ + memset(&lchan->meas, 0x00, sizeof(lchan->meas)); + + /* FIXME: clear history buffer: no need? */ + memset(buffer + 464, 0, 232); + + *first_fn = fn; + *mask = 0x00; + } + + /* Update mask */ + *mask |= (1 << bid); + + /* Update mask and RSSI */ + lchan->meas.rssi_sum += rssi; + lchan->meas.toa256_sum += toa256; + lchan->meas.rssi_num++; + lchan->meas.toa256_num++; + + /* Copy burst to the end of buffer of 6 bursts */ + offset = buffer + bid * 116 + 464; + memcpy(offset, bits + 3, 58); + memcpy(offset + 58, bits + 87, 58); + + /* Wait until complete set of bursts */ + if (bid != 1) + return 0; + + /* Check for complete set of bursts */ + if ((*mask & 0x3) != 0x3) { + LOGP(DSCHD, LOGL_ERROR, "Received incomplete traffic frame at " + "fn=%u (%u/%u) for %s\n", *first_fn, + (*first_fn) % ts->mf_layout->period, + ts->mf_layout->period, + lchan_desc->name); + + /* Send BFI */ + goto bfi; + } + + /* skip second of two TCH frames of FACCH was received */ + if (lchan->dl_ongoing_facch) { + lchan->dl_ongoing_facch = false; + memcpy(buffer, buffer + 232, 232); + memcpy(buffer + 232, buffer + 464, 232); + goto bfi; + } + + /* May we have a FACCH/H frame on the current frame number? */ + facch_now = sched_facch_h_dl_end(lchan->type, fn); + + switch (lchan->tch_mode) { + case GSM48_CMODE_SIGN: + case GSM48_CMODE_SPEECH_V1: /* HR */ + rc = gsm0503_tch_hr_decode(l2, buffer, + !facch_now, &n_errors, &n_bits_total); + break; + case GSM48_CMODE_SPEECH_AMR: /* AMR */ + /** + * TODO: AMR requires a dedicated loop, + * which will be implemented later... + */ + LOGP(DSCHD, LOGL_ERROR, "AMR isn't supported yet\n"); + return -ENOTSUP; + default: + LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); + return -EINVAL; + } + + /* Shift buffer by 4 bursts for interleaving */ + memcpy(buffer, buffer + 232, 232); + memcpy(buffer + 232, buffer + 464, 232); + + /* Check decoding result */ + if (rc < 4) { + LOGP(DSCHD, LOGL_ERROR, "Received bad TCH frame ending at " + "fn=%u for %s: %d\n", fn, lchan_desc->name, rc); + + /* Send BFI */ + goto bfi; + } else if (rc == GSM_MACBLOCK_LEN) { + lchan->dl_ongoing_facch = true; + /* FACCH received, forward it to the higher layers */ + sched_send_dt_ind(trx, ts, lchan, l2, GSM_MACBLOCK_LEN, + n_errors, false, false); + + /* Send BFI instead of a stolen TCH frame */ + goto bfi; + } else { + /* A good TCH frame received */ + l2_len = rc; + } + + /* Send a traffic frame to the higher layers */ + return sched_send_dt_ind(trx, ts, lchan, l2, l2_len, + n_errors, false, true); + +bfi: + /* Bad frame indication */ + l2_len = sched_bad_frame_ind(l2, lchan); + + /* Didn't try to decode */ + if (n_errors < 0) + n_errors = 116 * 4; + + /* Send a BFI frame to the higher layers */ + return sched_send_dt_ind(trx, ts, lchan, l2, l2_len, + n_errors, true, true); +} + +int tx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts, + struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid) +{ + const struct trx_lchan_desc *lchan_desc; + ubit_t burst[GSM_BURST_LEN]; + ubit_t *buffer, *offset; + const uint8_t *tsc; + uint8_t *mask; + size_t l2_len; + int rc; + + /* Set up pointers */ + lchan_desc = &trx_lchan_desc[lchan->type]; + mask = &lchan->tx_burst_mask; + buffer = lchan->tx_bursts; + + if (bid > 0) { + /* Align to the first burst */ + if (*mask == 0x00) + return 0; + goto send_burst; + } + + if (*mask == 0x00) { + /* Align transmission of the first FACCH/H frame */ + if (lchan->tch_mode == GSM48_CMODE_SIGN) + if (!sched_facch_h_ul_start(lchan->type, fn)) + return 0; + } + + /* Shift buffer by 2 bursts back for interleaving */ + memcpy(buffer, buffer + 232, 232); + + /* Also shift TX burst mask */ + *mask = *mask << 2; + + /* If FACCH/H blocks are still pending */ + if (lchan->ul_facch_blocks > 2) { + memcpy(buffer + 232, buffer + 464, 232); + goto send_burst; + } + + /* Check the current TCH mode */ + switch (lchan->tch_mode) { + case GSM48_CMODE_SIGN: + case GSM48_CMODE_SPEECH_V1: /* HR */ + l2_len = GSM_HR_BYTES + 1; + break; + case GSM48_CMODE_SPEECH_AMR: /* AMR */ + /** + * TODO: AMR requires a dedicated loop, + * which will be implemented later... + */ + LOGP(DSCHD, LOGL_ERROR, "AMR isn't supported yet, " + "dropping frame...\n"); + + /* Forget this primitive */ + sched_prim_drop(lchan); + return -ENOTSUP; + default: + LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u, " + "dropping frame...\n", lchan->tch_mode); + + /* Forget this primitive */ + sched_prim_drop(lchan); + return -EINVAL; + } + + /* Determine payload length */ + if (PRIM_IS_FACCH(lchan->prim)) { + l2_len = GSM_MACBLOCK_LEN; /* FACCH */ + } else if (lchan->prim->payload_len != l2_len) { + LOGP(DSCHD, LOGL_ERROR, "Primitive has odd length %zu " + "(expected %zu for TCH or %u for FACCH), so dropping...\n", + lchan->prim->payload_len, l2_len, GSM_MACBLOCK_LEN); + + /* Forget this primitive */ + sched_prim_drop(lchan); + return -EINVAL; + } + + /* Encode the payload */ + rc = gsm0503_tch_hr_encode(buffer, lchan->prim->payload, l2_len); + if (rc) { + LOGP(DSCHD, LOGL_ERROR, "Failed to encode L2 payload\n"); + + /* Forget this primitive */ + sched_prim_drop(lchan); + return -EINVAL; + } + + /* A FACCH/H frame occupies 6 bursts */ + if (PRIM_IS_FACCH(lchan->prim)) + lchan->ul_facch_blocks = 6; + +send_burst: + /* Determine which burst should be sent */ + offset = buffer + bid * 116; + + /* Update mask */ + *mask |= (1 << bid); + + /* Choose proper TSC */ + tsc = sched_nb_training_bits[trx->tsc]; + + /* Compose a new burst */ + memset(burst, 0, 3); /* TB */ + memcpy(burst + 3, offset, 58); /* Payload 1/2 */ + memcpy(burst + 61, tsc, 26); /* TSC */ + memcpy(burst + 87, offset + 58, 58); /* Payload 2/2 */ + memset(burst + 145, 0, 3); /* TB */ + + LOGP(DSCHD, LOGL_DEBUG, "Transmitting %s fn=%u ts=%u burst=%u\n", + lchan_desc->name, fn, ts->index, bid); + + /* Forward burst to transceiver */ + sched_trx_handle_tx_burst(trx, ts, lchan, fn, burst); + + /* In case of a FACCH/H frame, one block less */ + if (lchan->ul_facch_blocks) + lchan->ul_facch_blocks--; + + if ((*mask & 0x0f) == 0x0f) { + /** + * If no more FACCH/H blocks pending, + * confirm data / traffic sending + */ + if (!lchan->ul_facch_blocks) + sched_send_dt_conf(trx, ts, lchan, fn, + PRIM_IS_TCH(lchan->prim)); + + /* Forget processed primitive */ + sched_prim_drop(lchan); + } + + return 0; +} diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index 8bd3c72..bc51d96 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -463,7 +463,7 @@ /* TCH specific variables */ if (CHAN_IS_TCH(lchan->type)) { lchan->dl_ongoing_facch = 0; - lchan->ul_ongoing_facch = 0; + lchan->ul_facch_blocks = 0; lchan->tch_mode = GSM48_CMODE_SIGN; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index f8898cd..57b4782 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -171,9 +171,9 @@ uint8_t tch_mode; /*! \brief FACCH/H on downlink */ - uint8_t dl_ongoing_facch; - /*! \brief FACCH/H on uplink */ - uint8_t ul_ongoing_facch; + bool dl_ongoing_facch; + /*! \brief pending FACCH/H blocks on Uplink */ + uint8_t ul_facch_blocks; struct { /*! \brief Number of RSSI values */ -- To view, visit https://gerrit.osmocom.org/10460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb2a0850692c5ff86b13b820af10b12085589e67 Gerrit-Change-Number: 10460 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:56:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:56:29 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10455 ) Change subject: trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b59f60e1cbac8fb8fd557b6c67b5e376c0a6bbb Gerrit-Change-Number: 10455 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Aug 2018 07:56:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:56:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:56:39 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10453 ) Change subject: trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa7d9f806b3f18f2dfec931252f5119441b30e8a Gerrit-Change-Number: 10453 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Aug 2018 07:56:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:56:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:56:54 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: refactor prim dequeuing logic In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10454 ) Change subject: trxcon/sched_prim.c: refactor prim dequeuing logic ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib82ad2480ab1bc6b1df9576eb2bf5acbd398bf66 Gerrit-Change-Number: 10454 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Aug 2018 07:56:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:18 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass lchan to sched_bad_frame_ind() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10456 ) Change subject: trxcon/scheduler: pass lchan to sched_bad_frame_ind() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91fe86fef43aac68776a58c9acc37ef2a9ee8042 Gerrit-Change-Number: 10456 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Aug 2018 07:57:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:33 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: properly generate BFI for TCH/H In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10457 ) Change subject: trxcon/scheduler: fix: properly generate BFI for TCH/H ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46 Gerrit-Change-Number: 10457 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Aug 2018 07:57:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:53 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: get rid of useless lchan->rsl_mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10458 ) Change subject: trxcon/scheduler: get rid of useless lchan->rsl_mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec1abf777a74cf57deadafa95e2337cba5d02842 Gerrit-Change-Number: 10458 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 15 Aug 2018 07:57:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:57 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10453 ) Change subject: trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* ...................................................................... trxcon/sched_trx.h: add missing parentheses to PRIM_IS_* Change-Id: Ifa7d9f806b3f18f2dfec931252f5119441b30e8a --- M src/host/trxcon/sched_trx.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 17e30bf..cd9c0e4 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -296,10 +296,10 @@ (trx_lchan_desc[chan].link_id & TRX_CH_LID_SACCH) #define PRIM_IS_TCH(prim) \ - CHAN_IS_TCH(prim->chan) && prim->payload_len != GSM_MACBLOCK_LEN + (CHAN_IS_TCH(prim->chan) && prim->payload_len != GSM_MACBLOCK_LEN) #define PRIM_IS_FACCH(prim) \ - CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN + (CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN) struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, enum trx_lchan_type lchan_type); -- To view, visit https://gerrit.osmocom.org/10453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifa7d9f806b3f18f2dfec931252f5119441b30e8a Gerrit-Change-Number: 10453 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:57 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: refactor prim dequeuing logic In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10454 ) Change subject: trxcon/sched_prim.c: refactor prim dequeuing logic ...................................................................... trxcon/sched_prim.c: refactor prim dequeuing logic The previous primitive dequeuing logic (especially for TCH/F channels) was a bit complicated, and it could not be possible to reuse the existing code parts in the upcoming implementation of both TCH/H and FACCH/H channels without changing anything. In particular, this change introduces two internal functions: - prim_dequeue_one(), which merely dequeues a primitive of a given channel type (e.g. TRXC_SDCCH4_0); - prim_dequeue_tch(), which dequeues either a FACCH, or a speech TCH primitive of a given channel type (Lm or Bm). So the logic of the TCH/F prim dequeuing function has become cleaner, and the upcoming TCH/H prim dequeuing function, where FACCH/H prioritization is more complex than FACCH/F, will reuse the introduced functions. Change-Id: Ib82ad2480ab1bc6b1df9576eb2bf5acbd398bf66 --- M src/host/trxcon/sched_prim.c 1 file changed, 82 insertions(+), 54 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 2ee06d7..4987379 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -128,61 +128,98 @@ return 0; } +/* Dequeues a primitive of a given channel type */ +static struct trx_ts_prim *prim_dequeue_one(struct llist_head *queue, + enum trx_lchan_type lchan_type) +{ + struct trx_ts_prim *prim; + + /** + * There is no need to use the 'safe' list iteration here + * as an item removal is immediately followed by return. + */ + llist_for_each_entry(prim, queue, list) { + if (prim->chan == lchan_type) { + llist_del(&prim->list); + return prim; + } + } + + return NULL; +} + /** - * Dequeues a TCH or FACCH frame, prioritizing the second. - * In case if a FACCH frame is found, a TCH frame is being + * Dequeues either a FACCH, or a speech TCH primitive + * of a given channel type (Lm or Bm). + * + * Note: we could avoid 'lchan_type' parameter and just + * check the prim's channel type using CHAN_IS_TCH(), + * but the current approach is a bit more flexible, + * and allows one to have both sub-slots of TCH/H + * enabled on same timeslot e.g. for testing... + * + * @param queue transmit queue to take a prim from + * @param lchan_type required channel type of a primitive, + * e.g. TRXC_TCHF, TRXC_TCHH_0, or TRXC_TCHH_1 + * @param facch FACCH (true) or speech (false) prim? + * @return either a FACCH, or a TCH primitive if found, + * otherwise NULL + */ +static struct trx_ts_prim *prim_dequeue_tch(struct llist_head *queue, + enum trx_lchan_type lchan_type, bool facch) +{ + struct trx_ts_prim *prim; + + /** + * There is no need to use the 'safe' list iteration here + * as an item removal is immediately followed by return. + */ + llist_for_each_entry(prim, queue, list) { + if (prim->chan != lchan_type) + continue; + + /* Either FACCH, or not FACCH */ + if (PRIM_IS_FACCH(prim) != facch) + continue; + + llist_del(&prim->list); + return prim; + } + + return NULL; +} + +/** + * Dequeues either a TCH/F, or a FACCH/F prim (preferred). + * If a FACCH/F prim is found, one TCH/F prim is being * dropped (i.e. replaced). * * @param queue a transmit queue to take a prim from - * @return a FACCH or TCH primitive, otherwise NULL + * @return either a FACCH/F, or a TCH/F primitive, + * otherwise NULL */ -static struct trx_ts_prim *sched_prim_dequeue_tch(struct llist_head *queue) +static struct trx_ts_prim *prim_dequeue_tch_f(struct llist_head *queue) { - struct trx_ts_prim *facch = NULL; - struct trx_ts_prim *tch = NULL; - struct trx_ts_prim *i; + struct trx_ts_prim *facch; + struct trx_ts_prim *tch; - /* Attempt to find a pair of FACCH and TCH frames */ - llist_for_each_entry(i, queue, list) { - /* Find one FACCH frame */ - if (!facch && PRIM_IS_FACCH(i)) - facch = i; + /* Attempt to find a pair of both FACCH/F and TCH/F frames */ + facch = prim_dequeue_tch(queue, TRXC_TCHF, true); + tch = prim_dequeue_tch(queue, TRXC_TCHF, false); - /* Find one TCH frame */ - if (!tch && PRIM_IS_TCH(i)) - tch = i; - - /* If both are found */ - if (facch && tch) - break; - } - - /* Prioritize FACCH */ - if (facch && tch) { - /* We found a pair, dequeue both */ - llist_del(&facch->list); - llist_del(&tch->list); - - /* Drop TCH */ - talloc_free(tch); - - /* FACCH replaces TCH */ - return facch; - } else if (facch) { - /* Only FACCH was found */ - llist_del(&facch->list); + /* Prioritize FACCH/F, if found */ + if (facch) { + /* One TCH/F prim is replaced */ + if (tch) + talloc_free(tch); return facch; } else if (tch) { - /* Only TCH was found */ - llist_del(&tch->list); + /* Only TCH/F prim was found */ return tch; + } else { + /* Nothing was found, e.g. when only SACCH frames are in queue */ + return NULL; } - - /** - * Nothing was found, - * e.g. only SACCH frames are in queue - */ - return NULL; } /** @@ -196,24 +233,15 @@ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, enum trx_lchan_type lchan_type) { - struct trx_ts_prim *prim; - /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; /* TCH requires FACCH prioritization, so handle it separately */ if (CHAN_IS_TCH(lchan_type)) - return sched_prim_dequeue_tch(queue); + return prim_dequeue_tch_f(queue); - llist_for_each_entry(prim, queue, list) { - if (prim->chan == lchan_type) { - llist_del(&prim->list); - return prim; - } - } - - return NULL; + return prim_dequeue_one(queue, lchan_type); } /** -- To view, visit https://gerrit.osmocom.org/10454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib82ad2480ab1bc6b1df9576eb2bf5acbd398bf66 Gerrit-Change-Number: 10454 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:57 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10455 ) Change subject: trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims ...................................................................... trxcon/sched_prim.c: properly handle both TCH/H and FACCH/H prims Initially it was assumed that FACCH prioritization should be done in the same way for both TCH/F and TCH/H. Moreover, it was not possible to confirm this, because TCH/H was (and still) not implemented yet. But according to the specs: - unlike FACCH/F, FACCH/H transmissions shall be aligned within a multiframe, i.e. can only be initiated on particular frame numbers (see GSM 05.02, clause 7); - unlike FACCH/F, a FACCH/H frame steals two TCH/F frames; so the TCH/H (including FACCH/H) primitives should be handled separately from the TCH/F (including FACCH/F) primitives. Change-Id: I9b59f60e1cbac8fb8fd557b6c67b5e376c0a6bbb --- M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 3 files changed, 86 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 4987379..acd08bf 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -223,25 +223,105 @@ } /** + * Dequeues either a TCH/H, or a FACCH/H prim (preferred). + * If a FACCH/H prim is found, two TCH/H prims are being + * dropped (i.e. replaced). + * + * According to GSM 05.02, the following blocks can be used + * to carry FACCH/H data (see clause 7, table 1 of 9): + * + * UL FACCH/H0: + * B0(0,2,4,6,8,10), B1(8,10,13,15,17,19), B2(17,19,21,23,0,2) + * + * UL FACCH/H1: + * B0(1,3,5,7,9,11), B1(9,11,14,16,18,20), B2(18,20,22,24,1,3) + * + * where the numbers within brackets are fn % 26. + * + * @param queue transmit queue to take a prim from + * @param fn the current frame number + * @param lchan_type required channel type of a primitive, + * @return either a FACCH/H, or a TCH/H primitive, + * otherwise NULL + */ +static struct trx_ts_prim *prim_dequeue_tch_h(struct llist_head *queue, + uint32_t fn, enum trx_lchan_type lchan_type) +{ + struct trx_ts_prim *facch; + struct trx_ts_prim *tch; + bool facch_now = false; + uint32_t fn_mf; + + /* Traffic multiframe period */ + fn_mf = fn % 26; + + /* FACCH/H0 frame alignment */ + if (lchan_type == TRXC_TCHH_0) + if (fn_mf == 0 || fn_mf == 8 || fn_mf == 17) + facch_now = true; + + /* FACCH/H1 frame alignment */ + if (lchan_type == TRXC_TCHH_1) + if (fn_mf == 1 || fn_mf == 9 || fn_mf == 18) + facch_now = true; + + /* If FACCH/H is not allowed for a given frame number */ + if (!facch_now) /* Just dequeue a TCH/H prim */ + goto no_facch; + + /* If there are no FACCH/H prims in the queue */ + facch = prim_dequeue_tch(queue, lchan_type, true); + if (!facch) /* Just dequeue a TCH/H prim */ + goto no_facch; + + /* FACCH/H prim replaces two TCH/F prims */ + tch = prim_dequeue_tch(queue, lchan_type, false); + if (tch) { + /* At least one TCH/H prim is dropped */ + talloc_free(tch); + + /* Attempt to find another */ + tch = prim_dequeue_tch(queue, lchan_type, false); + if (tch) /* Drop the second TCH/H prim */ + talloc_free(tch); + } + + return facch; + +no_facch: + return prim_dequeue_tch(queue, lchan_type, false); +} + +/** * Dequeues a single primitive of required type * from a specified transmit queue. * * @param queue a transmit queue to take a prim from + * @param fn the current frame number (used for FACCH/H) * @param lchan_type required primitive type * @return a primitive or NULL if not found */ struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, - enum trx_lchan_type lchan_type) + uint32_t fn, enum trx_lchan_type lchan_type) { /* There is nothing to dequeue */ if (llist_empty(queue)) return NULL; - /* TCH requires FACCH prioritization, so handle it separately */ - if (CHAN_IS_TCH(lchan_type)) + switch (lchan_type) { + /* TCH/F requires FACCH/F prioritization */ + case TRXC_TCHF: return prim_dequeue_tch_f(queue); - return prim_dequeue_one(queue, lchan_type); + /* FACCH/H prioritization is a bit more complex */ + case TRXC_TCHH_0: + case TRXC_TCHH_1: + return prim_dequeue_tch_h(queue, fn, lchan_type); + + /* Other kinds of logical channels */ + default: + return prim_dequeue_one(queue, lchan_type); + } } /** diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index c263ce7..fd43a56 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -95,7 +95,7 @@ * attempt to obtain a new one from queue */ if (lchan->prim == NULL) - lchan->prim = sched_prim_dequeue(&ts->tx_prims, chan); + lchan->prim = sched_prim_dequeue(&ts->tx_prims, fn, chan); /* TODO: report TX buffers health to the higher layers */ diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index cd9c0e4..f3fa9df 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -302,7 +302,7 @@ (CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN) struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue, - enum trx_lchan_type lchan_type); + uint32_t fn, enum trx_lchan_type lchan_type); int sched_prim_dummy(struct trx_lchan_state *lchan); void sched_prim_drop(struct trx_lchan_state *lchan); void sched_prim_flush_queue(struct llist_head *list); -- To view, visit https://gerrit.osmocom.org/10455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b59f60e1cbac8fb8fd557b6c67b5e376c0a6bbb Gerrit-Change-Number: 10455 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:57 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: pass lchan to sched_bad_frame_ind() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10456 ) Change subject: trxcon/scheduler: pass lchan to sched_bad_frame_ind() ...................................................................... trxcon/scheduler: pass lchan to sched_bad_frame_ind() Instead of passing the information about a logical channel, it makes sense to pass the pointer to its state where everything is stored. This approach would allow to avoid adding more arguments every time, e.g. in case of AMR. Change-Id: I91fe86fef43aac68776a58c9acc37ef2a9ee8042 --- M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.h 4 files changed, 10 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 47b0162..03cdc67 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -139,17 +139,17 @@ * Composes a bad frame indication message * according to the current tch_mode. * - * @param l2 Pointer to allocated byte array - * @param tch_mode Current TCH mode + * @param l2 Caller-allocated byte array + * @param lchan Logical channel to generate BFI for * @return How much bytes were written */ -size_t sched_bad_frame_ind(uint8_t *l2, uint8_t rsl_cmode, uint8_t tch_mode) +size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan) { /* BFI is only required for speech */ - if (rsl_cmode != RSL_CMOD_SPD_SPEECH) + if (lchan->rsl_cmode != RSL_CMOD_SPD_SPEECH) return 0; - switch (tch_mode) { + switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* Full Rate */ memset(l2, 0x00, GSM_FR_BYTES); @@ -163,7 +163,7 @@ /* FIXME: AMR is not implemented yet */ return 0; default: - LOGP(DSCH, LOGL_ERROR, "Invalid TCH mode: %u\n", tch_mode); + LOGP(DSCH, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); return 0; } } diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index e20b461..86cdb12 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -166,7 +166,7 @@ bfi: /* Bad frame indication */ - l2_len = sched_bad_frame_ind(l2, rsl_cmode, tch_mode); + l2_len = sched_bad_frame_ind(l2, lchan); /* Didn't try to decode */ if (n_errors < 0) diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index acd08bf..2aeaa5d 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -373,12 +373,8 @@ * other channels: LAPDm fill frame. */ if (CHAN_IS_TCH(chan) && TCH_MODE_IS_SPEECH(tch_mode)) { - /** - * Silence frame indication - * HACK: use actual rsl_cmode! - */ - prim_len = sched_bad_frame_ind(prim_buffer, - RSL_CMOD_SPD_SPEECH, tch_mode); + /* Bad frame indication */ + prim_len = sched_bad_frame_ind(prim_buffer, lchan); } else if (CHAN_IS_TCH(chan) && TCH_MODE_IS_DATA(tch_mode)) { /* FIXME: should we do anything for CSD? */ return 0; diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index f3fa9df..2aafbf0 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -317,7 +317,7 @@ /* Shared declarations for lchan handlers */ extern const uint8_t sched_nb_training_bits[8][26]; -size_t sched_bad_frame_ind(uint8_t *l2, uint8_t rsl_cmode, uint8_t tch_mode); +size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan); int sched_send_dt_ind(struct trx_instance *trx, struct trx_ts *ts, struct trx_lchan_state *lchan, uint8_t *l2, size_t l2_len, int bit_error_count, bool dec_failed, bool traffic); -- To view, visit https://gerrit.osmocom.org/10456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I91fe86fef43aac68776a58c9acc37ef2a9ee8042 Gerrit-Change-Number: 10456 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:58 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: fix: properly generate BFI for TCH/H In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10457 ) Change subject: trxcon/scheduler: fix: properly generate BFI for TCH/H ...................................................................... trxcon/scheduler: fix: properly generate BFI for TCH/H When relying on GSM 04.08 channel mode (GSM48_CMODE_*), one should distinguish between Bm (full rate) and Lm (half rate) channels. This change prevents the scheduler from generating TCH/F BFI instead of TCH/H BFI on the corresponding channels. Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46 --- M src/host/trxcon/sched_lchan_common.c 1 file changed, 10 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 03cdc67..76a32fe 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -151,10 +151,16 @@ switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: - case GSM48_CMODE_SPEECH_V1: /* Full Rate */ - memset(l2, 0x00, GSM_FR_BYTES); - l2[0] = 0xd0; - return GSM_FR_BYTES; + case GSM48_CMODE_SPEECH_V1: + if (lchan->type == TRXC_TCHF) { /* Full Rate */ + memset(l2, 0x00, GSM_FR_BYTES); + l2[0] = 0xd0; + return GSM_FR_BYTES; + } else { /* Half Rate */ + memset(l2 + 1, 0x00, GSM_HR_BYTES); + l2[0] = 0x70; /* F = 0, FT = 111 */ + return GSM_HR_BYTES + 1; + } case GSM48_CMODE_SPEECH_EFR: /* Enhanced Full Rate */ memset(l2, 0x00, GSM_EFR_BYTES); l2[0] = 0xc0; -- To view, visit https://gerrit.osmocom.org/10457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46 Gerrit-Change-Number: 10457 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 07:57:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 07:57:58 +0000 Subject: Change in osmocom-bb[master]: trxcon/scheduler: get rid of useless lchan->rsl_mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10458 ) Change subject: trxcon/scheduler: get rid of useless lchan->rsl_mode ...................................................................... trxcon/scheduler: get rid of useless lchan->rsl_mode This field of the logical channel state structure was not used at all as there is nothing related to A-bis / RSL in trxcon itself. Change-Id: Iec1abf777a74cf57deadafa95e2337cba5d02842 --- M src/host/trxcon/sched_lchan_common.c M src/host/trxcon/sched_lchan_tchf.c M src/host/trxcon/sched_prim.c M src/host/trxcon/sched_trx.c M src/host/trxcon/sched_trx.h 5 files changed, 5 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c index 76a32fe..2767b90 100644 --- a/src/host/trxcon/sched_lchan_common.c +++ b/src/host/trxcon/sched_lchan_common.c @@ -36,7 +36,6 @@ #include #include -#include #include "l1ctl_proto.h" #include "scheduler.h" @@ -145,10 +144,6 @@ */ size_t sched_bad_frame_ind(uint8_t *l2, struct trx_lchan_state *lchan) { - /* BFI is only required for speech */ - if (lchan->rsl_cmode != RSL_CMOD_SPD_SPEECH) - return 0; - switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: diff --git a/src/host/trxcon/sched_lchan_tchf.c b/src/host/trxcon/sched_lchan_tchf.c index 86cdb12..f6465f9 100644 --- a/src/host/trxcon/sched_lchan_tchf.c +++ b/src/host/trxcon/sched_lchan_tchf.c @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -50,7 +49,6 @@ { const struct trx_lchan_desc *lchan_desc; int n_errors = -1, n_bits_total, rc; - uint8_t rsl_cmode, tch_mode, mode; sbit_t *buffer, *offset; uint8_t l2[128], *mask; uint32_t *first_fn; @@ -92,15 +90,6 @@ if (bid != 3) return 0; - /** - * Get current RSL / TCH modes - * - * FIXME: we do support speech only, and - * CSD support may be implemented latter. - */ - rsl_cmode = RSL_CMOD_SPD_SPEECH; - tch_mode = lchan->tch_mode; - /* Check for complete set of bursts */ if ((*mask & 0xf) != 0xf) { LOGP(DSCHD, LOGL_ERROR, "Received incomplete traffic frame at " @@ -113,10 +102,7 @@ goto bfi; } - mode = rsl_cmode != RSL_CMOD_SPD_SPEECH ? - GSM48_CMODE_SPEECH_V1 : tch_mode; - - switch (mode) { + switch (lchan->tch_mode) { case GSM48_CMODE_SIGN: case GSM48_CMODE_SPEECH_V1: /* FR */ rc = gsm0503_tch_fr_decode(l2, buffer, @@ -134,7 +120,7 @@ LOGP(DSCHD, LOGL_ERROR, "AMR isn't supported yet\n"); return -ENOTSUP; default: - LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u\n", tch_mode); + LOGP(DSCHD, LOGL_ERROR, "Invalid TCH mode: %u\n", lchan->tch_mode); return -EINVAL; } diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c index 2aeaa5d..e663bc3 100644 --- a/src/host/trxcon/sched_prim.c +++ b/src/host/trxcon/sched_prim.c @@ -32,7 +32,6 @@ #include #include -#include #include "scheduler.h" #include "sched_trx.h" diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c index fd43a56..8bd3c72 100644 --- a/src/host/trxcon/sched_trx.c +++ b/src/host/trxcon/sched_trx.c @@ -465,8 +465,7 @@ lchan->dl_ongoing_facch = 0; lchan->ul_ongoing_facch = 0; - lchan->rsl_cmode = 0x00; - lchan->tch_mode = 0x00; + lchan->tch_mode = GSM48_CMODE_SIGN; /* Reset AMR state */ memset(&lchan->amr, 0x00, sizeof(lchan->amr)); diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h index 2aafbf0..730923b 100644 --- a/src/host/trxcon/sched_trx.h +++ b/src/host/trxcon/sched_trx.h @@ -167,8 +167,8 @@ /*! \brief A primitive being sent */ struct trx_ts_prim *prim; - /*! \brief Mode for TCH channels */ - uint8_t rsl_cmode, tch_mode; + /*! \brief Mode for TCH channels (see GSM48_CMODE_*) */ + uint8_t tch_mode; /*! \brief FACCH/H on downlink */ uint8_t dl_ongoing_facch; -- To view, visit https://gerrit.osmocom.org/10458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iec1abf777a74cf57deadafa95e2337cba5d02842 Gerrit-Change-Number: 10458 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 08:00:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 15 Aug 2018 08:00:40 +0000 Subject: Change in osmo-sip-connector[master]: merges commit from lynxis - changes byte order for IPv4 address in SDP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: merges commit from lynxis - changes byte order for IPv4 address in SDP ...................................................................... Patch Set 1: Agreeing with vadim here. you can set GIT_AUTHOR_NAME / GIT_AUTHOR_EMAIL when doing the commit and recycle the original changelog. Thanks! -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 1 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 15 Aug 2018 08:00:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 09:29:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 15 Aug 2018 09:29:22 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binaries provided by other recipes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10451 ) Change subject: openbsc: Drop binaries provided by other recipes ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc File recipes-osmocom/openbsc/openbsc.inc: https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc at 39 PS2, Line 39: osmo-bsc_mgcp is provided by osmo-mgw.bb > are you sure about this? If so, it is IMHO actually a bug. osmo-mgw. [?] osmo-mgw.bb generated packages with its contents: 4.0K ./libosmo-legacy-mgcp.shlibdeps 4.0K ./osmo-mgw/etc/osmocom/osmo-mgw.cfg 8.0K ./osmo-mgw/etc/osmocom 12K ./osmo-mgw/etc 96K ./osmo-mgw/usr/bin/osmo-mgw 100K ./osmo-mgw/usr/bin 104K ./osmo-mgw/usr 4.0K ./osmo-mgw/lib/systemd/system/osmo-mgw.service 8.0K ./osmo-mgw/lib/systemd/system 12K ./osmo-mgw/lib/systemd 16K ./osmo-mgw/lib 136K ./osmo-mgw 4.0K ./libosmo-mgcp-client.shlibdeps 4.0K ./osmo-mgw.shlibdeps 4.0K ./libosmo-mgcp-dev/usr/include/osmocom/mgcp/osmux.h 8.0K ./libosmo-mgcp-dev/usr/include/osmocom/mgcp/mgcp.h 12K ./libosmo-mgcp-dev/usr/include/osmocom/mgcp/mgcp_internal.h 4.0K ./libosmo-mgcp-dev/usr/include/osmocom/mgcp/mgcp_common.h 32K ./libosmo-mgcp-dev/usr/include/osmocom/mgcp 36K ./libosmo-mgcp-dev/usr/include/osmocom 40K ./libosmo-mgcp-dev/usr/include 44K ./libosmo-mgcp-dev/usr 48K ./libosmo-mgcp-dev 4.0K ./osmo-mgw-doc/usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw.cfg 8.0K ./osmo-mgw-doc/usr/share/doc/osmo-mgw/examples/osmo-mgw 4.0K ./osmo-mgw-doc/usr/share/doc/osmo-mgw/examples/osmo-bsc_mgcp/mgcp.cfg 8.0K ./osmo-mgw-doc/usr/share/doc/osmo-mgw/examples/osmo-bsc_mgcp 20K ./osmo-mgw-doc/usr/share/doc/osmo-mgw/examples 24K ./osmo-mgw-doc/usr/share/doc/osmo-mgw 28K ./osmo-mgw-doc/usr/share/doc 32K ./osmo-mgw-doc/usr/share 36K ./osmo-mgw-doc/usr 40K ./osmo-mgw-doc 104K ./libosmo-legacy-mgcp/usr/lib/libosmo-legacy-mgcp.so.0.1.0 0 ./libosmo-legacy-mgcp/usr/lib/libosmo-legacy-mgcp.so.0 108K ./libosmo-legacy-mgcp/usr/lib 112K ./libosmo-legacy-mgcp/usr 116K ./libosmo-legacy-mgcp 4.0K ./libosmo-mgcp 4.0K ./osmo-mgw-locale 288K ./osmo-mgw-dbg/usr/bin/.debug/osmo-mgw 32K ./osmo-mgw-dbg/usr/bin/.debug/osmo-bsc_mgcp 324K ./osmo-mgw-dbg/usr/bin/.debug 328K ./osmo-mgw-dbg/usr/bin 80K ./osmo-mgw-dbg/usr/lib/.debug/libosmo-mgcp-client.so.3.1.0 240K ./osmo-mgw-dbg/usr/lib/.debug/libosmo-legacy-mgcp.so.0.1.0 324K ./osmo-mgw-dbg/usr/lib/.debug 328K ./osmo-mgw-dbg/usr/lib 660K ./osmo-mgw-dbg/usr 664K ./osmo-mgw-dbg 4.0K ./osmo-mgw-dev 4.0K ./libosmo-mgcp-client-dev/usr/include/osmocom/mgcp_client/mgcp_client_fsm.h 4.0K ./libosmo-mgcp-client-dev/usr/include/osmocom/mgcp_client/mgcp_common.h 8.0K ./libosmo-mgcp-client-dev/usr/include/osmocom/mgcp_client/mgcp_client.h 20K ./libosmo-mgcp-client-dev/usr/include/osmocom/mgcp_client 24K ./libosmo-mgcp-client-dev/usr/include/osmocom 28K ./libosmo-mgcp-client-dev/usr/include 0 ./libosmo-mgcp-client-dev/usr/lib/libosmo-mgcp-client.so 4.0K ./libosmo-mgcp-client-dev/usr/lib/pkgconfig/libosmo-mgcp-client.pc 8.0K ./libosmo-mgcp-client-dev/usr/lib/pkgconfig 12K ./libosmo-mgcp-client-dev/usr/lib 44K ./libosmo-mgcp-client-dev/usr 48K ./libosmo-mgcp-client-dev 36K ./libosmo-mgcp-client/usr/lib/libosmo-mgcp-client.so.3.1.0 0 ./libosmo-mgcp-client/usr/lib/libosmo-mgcp-client.so.3 40K ./libosmo-mgcp-client/usr/lib 44K ./libosmo-mgcp-client/usr 48K ./libosmo-mgcp-client 4.0K ./osmo-bsc-mgcp.shlibdeps 4.0K ./osmo-mgw-staticdev 4.0K ./libosmo-legacy-mgcp-dev/usr/include/osmocom/legacy_mgcp/osmux.h 8.0K ./libosmo-legacy-mgcp-dev/usr/include/osmocom/legacy_mgcp/mgcp.h 12K ./libosmo-legacy-mgcp-dev/usr/include/osmocom/legacy_mgcp/mgcp_internal.h 28K ./libosmo-legacy-mgcp-dev/usr/include/osmocom/legacy_mgcp 32K ./libosmo-legacy-mgcp-dev/usr/include/osmocom 36K ./libosmo-legacy-mgcp-dev/usr/include 0 ./libosmo-legacy-mgcp-dev/usr/lib/libosmo-legacy-mgcp.so 4.0K ./libosmo-legacy-mgcp-dev/usr/lib/pkgconfig/libosmo-legacy-mgcp.pc 8.0K ./libosmo-legacy-mgcp-dev/usr/lib/pkgconfig 12K ./libosmo-legacy-mgcp-dev/usr/lib 52K ./libosmo-legacy-mgcp-dev/usr 56K ./libosmo-legacy-mgcp-dev 4.0K ./osmo-bsc-mgcp/etc/osmocom/osmo-bsc-mgcp.cfg 8.0K ./osmo-bsc-mgcp/etc/osmocom 12K ./osmo-bsc-mgcp/etc 16K ./osmo-bsc-mgcp/usr/bin/osmo-bsc_mgcp 20K ./osmo-bsc-mgcp/usr/bin 24K ./osmo-bsc-mgcp/usr 4.0K ./osmo-bsc-mgcp/lib/systemd/system/osmo-bsc-mgcp.service 8.0K ./osmo-bsc-mgcp/lib/systemd/system 12K ./osmo-bsc-mgcp/lib/systemd 16K ./osmo-bsc-mgcp/lib 56K ./osmo-bsc-mgcp 1.3M . So yes, it is built by osmo-mgw (I also thought first it wasn't). Following your logic I think we should neither have libosmo-legacy-mgcp stuff in osmo-mgw, but there it is still. I think it's fine to use the one from osmo-mgw and slowly get rid of stuff in openbsc.git. What do you think? https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc at 42 PS2, Line 42: provided by osmo-bsc.bb > can they all be installed separately without installing/depending on osmo-bsc? After all, if you r [?] Yes, in osmo-bsc.bb they are put into separated packages: ipaccess-utils, meas-utils, bs11-utils, abisip-find. Anyway, if they were in package osmo-bsc it would still be fine enough since osmo-bsc and osmo-bsc-sccplite package files doesn't collide (due to openb'sc's osmo-bsc->osmo-bsc-sccplite name change), so both packages can be installed at the same time. -- To view, visit https://gerrit.osmocom.org/10451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 Gerrit-Change-Number: 10451 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 15 Aug 2018 09:29:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 12:12:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 15 Aug 2018 12:12:34 +0000 Subject: Change in osmo-sgsn[master]: Drop gprs_msgb_copy with libosmocore replacement Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10461 Change subject: Drop gprs_msgb_copy with libosmocore replacement ...................................................................... Drop gprs_msgb_copy with libosmocore replacement gprs_msgb_copy was introduced in libosmocore 0.94 (f78ec5ce0d0f6038147d9b9e14d81094309ba5d5) as bssgp_msgb_copy. Let's use that one to avoid code duplication. Change-Id: I42a65fd8e4045fafadf5694f2d8d0c5e7ab350a0 --- M include/osmocom/sgsn/gprs_utils.h M src/gprs/gb_proxy.c M src/gprs/gprs_gmm.c M src/gprs/gprs_utils.c M tests/gbproxy/gbproxy_test.c 5 files changed, 6 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/10461/1 diff --git a/include/osmocom/sgsn/gprs_utils.h b/include/osmocom/sgsn/gprs_utils.h index e06364d..8e47e90 100644 --- a/include/osmocom/sgsn/gprs_utils.h +++ b/include/osmocom/sgsn/gprs_utils.h @@ -29,7 +29,6 @@ struct msgb; struct gprs_ra_id; -struct msgb *gprs_msgb_copy(const struct msgb *msg, const char *name); int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, size_t old_size, size_t new_size); int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str); diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 447772f..dc3c810 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -499,7 +499,7 @@ msgb_nsei(msg), parse_ctx->llc_msg_name ? parse_ctx->llc_msg_name : "BSSGP"); - stored_msg = gprs_msgb_copy(msg, "process_bssgp_ul"); + stored_msg = bssgp_msgb_copy(msg, "process_bssgp_ul"); msgb_enqueue(&link_info->stored_msgs, stored_msg); if (!link_info->imsi_acq_pending) { @@ -763,7 +763,7 @@ { /* create a copy of the message so the old one can * be free()d safely when we return from gbprox_rcvmsg() */ - struct msgb *msg = gprs_msgb_copy(old_msg, "msgb_relay2sgsn"); + struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2sgsn"); int rc; DEBUGP(DGPRS, "NSEI=%u proxying BTS->SGSN (NS_BVCI=%u, NSEI=%u)\n", @@ -787,7 +787,7 @@ { /* create a copy of the message so the old one can * be free()d safely when we return from gbprox_rcvmsg() */ - struct msgb *msg = gprs_msgb_copy(old_msg, "msgb_relay2peer"); + struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2peer"); int rc; DEBUGP(DGPRS, "NSEI=%u proxying SGSN->BSS (NS_BVCI=%u, NSEI=%u)\n", @@ -1179,7 +1179,7 @@ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, orig_msg); } - msg = gprs_msgb_copy(orig_msg, "rx_sig_from_sgsn"); + msg = bssgp_msgb_copy(orig_msg, "rx_sig_from_sgsn"); gbprox_process_bssgp_dl(cfg, msg, NULL); /* Update message info */ bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg); diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 91f769d..bea63dc 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2648,7 +2648,7 @@ * and the dynamic resolution will be the right thing * in the long run. */ - msg = gprs_msgb_copy(_msg, __func__); + msg = bssgp_msgb_copy(_msg, __func__); if (!msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(_msg); uint8_t transaction_id = gsm48_hdr_trans_id(gh); diff --git a/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c index d7cef1c..c4b66d6 100644 --- a/src/gprs/gprs_utils.c +++ b/src/gprs/gprs_utils.c @@ -30,55 +30,6 @@ #include -/* FIXME: this needs to go to libosmocore/msgb.c */ -struct msgb *gprs_msgb_copy(const struct msgb *msg, const char *name) -{ - struct libgb_msgb_cb *old_cb, *new_cb; - struct msgb *new_msg; - - new_msg = msgb_alloc(msg->data_len, name); - if (!new_msg) - return NULL; - - /* copy data */ - memcpy(new_msg->_data, msg->_data, new_msg->data_len); - - /* copy header */ - new_msg->len = msg->len; - new_msg->data += msg->data - msg->_data; - new_msg->head += msg->head - msg->_data; - new_msg->tail += msg->tail - msg->_data; - - if (msg->l1h) - new_msg->l1h = new_msg->_data + (msg->l1h - msg->_data); - if (msg->l2h) - new_msg->l2h = new_msg->_data + (msg->l2h - msg->_data); - if (msg->l3h) - new_msg->l3h = new_msg->_data + (msg->l3h - msg->_data); - if (msg->l4h) - new_msg->l4h = new_msg->_data + (msg->l4h - msg->_data); - - /* copy GB specific data */ - old_cb = LIBGB_MSGB_CB(msg); - new_cb = LIBGB_MSGB_CB(new_msg); - - if (old_cb->bssgph) - new_cb->bssgph = new_msg->_data + (old_cb->bssgph - msg->_data); - if (old_cb->llch) - new_cb->llch = new_msg->_data + (old_cb->llch - msg->_data); - - /* bssgp_cell_id is a pointer into the old msgb, so we need to make - * it a pointer into the new msgb */ - if (old_cb->bssgp_cell_id) - new_cb->bssgp_cell_id = new_msg->_data + - (old_cb->bssgp_cell_id - msg->_data); - new_cb->nsei = old_cb->nsei; - new_cb->bvci = old_cb->bvci; - new_cb->tlli = old_cb->tlli; - - return new_msg; -} - /* TODO: Move this to libosmocore/msgb.c */ int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, size_t old_size, size_t new_size) diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c index 157da8b..a183320 100644 --- a/tests/gbproxy/gbproxy_test.c +++ b/tests/gbproxy/gbproxy_test.c @@ -1061,7 +1061,7 @@ if (received_messages) { struct msgb *msg_copy; - msg_copy = gprs_msgb_copy(msg, "received_messages"); + msg_copy = bssgp_msgb_copy(msg, "received_messages"); llist_add_tail(&msg_copy->list, received_messages); } -- To view, visit https://gerrit.osmocom.org/10461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I42a65fd8e4045fafadf5694f2d8d0c5e7ab350a0 Gerrit-Change-Number: 10461 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 12:12:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 15 Aug 2018 12:12:35 +0000 Subject: Change in osmo-sgsn[master]: Drop gprs_msgb_resize_area with libosmocore replacement Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10462 Change subject: Drop gprs_msgb_resize_area with libosmocore replacement ...................................................................... Drop gprs_msgb_resize_area with libosmocore replacement gprs_msgb_resize_area was introduced in libosmocore 0.94 (f78ec5ce0d0f6038147d9b9e14d81094309ba5d5) as msgb_resize_area. Let's use that one to avoid code duplication. Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c --- M include/osmocom/sgsn/gprs_utils.h M src/gprs/gb_proxy_patch.c M src/gprs/gprs_utils.c 3 files changed, 2 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/62/10462/1 diff --git a/include/osmocom/sgsn/gprs_utils.h b/include/osmocom/sgsn/gprs_utils.h index 8e47e90..eacaec7 100644 --- a/include/osmocom/sgsn/gprs_utils.h +++ b/include/osmocom/sgsn/gprs_utils.h @@ -29,8 +29,6 @@ struct msgb; struct gprs_ra_id; -int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, - size_t old_size, size_t new_size); int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str); /* GSM 04.08, 10.5.7.3 GPRS Timer */ diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c index 496f605..9cca9a8 100644 --- a/src/gprs/gb_proxy_patch.c +++ b/src/gprs/gb_proxy_patch.c @@ -112,7 +112,7 @@ osmo_apn_to_str(str1, apn, apn_len)); *new_apn_ie_len = 0; - gprs_msgb_resize_area(msg, apn_ie, apn_ie_len, 0); + msgb_resize_area(msg, apn_ie, apn_ie_len, 0); } else { /* Resize the IE */ char str1[110]; @@ -129,7 +129,7 @@ peer->cfg->core_apn_size)); *new_apn_ie_len = peer->cfg->core_apn_size + 2; - gprs_msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size); + msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size); memcpy(apn, peer->cfg->core_apn, peer->cfg->core_apn_size); hdr->apn_len = peer->cfg->core_apn_size; } @@ -463,4 +463,3 @@ return 1; } - diff --git a/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c index c4b66d6..13641c1 100644 --- a/src/gprs/gprs_utils.c +++ b/src/gprs/gprs_utils.c @@ -30,41 +30,6 @@ #include -/* TODO: Move this to libosmocore/msgb.c */ -int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, - size_t old_size, size_t new_size) -{ - int rc; - uint8_t *rest = area + old_size; - int rest_len = msg->len - old_size - (area - msg->data); - int delta_size = (int)new_size - (int)old_size; - - if (delta_size == 0) - return 0; - - if (delta_size > 0) { - rc = msgb_trim(msg, msg->len + delta_size); - if (rc < 0) - return rc; - } - - memmove(area + new_size, area + old_size, rest_len); - - if (msg->l1h >= rest) - msg->l1h += delta_size; - if (msg->l2h >= rest) - msg->l2h += delta_size; - if (msg->l3h >= rest) - msg->l3h += delta_size; - if (msg->l4h >= rest) - msg->l4h += delta_size; - - if (delta_size < 0) - msgb_trim(msg, msg->len + delta_size); - - return 0; -} - int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str) { uint8_t *last_len_field; -- To view, visit https://gerrit.osmocom.org/10462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c Gerrit-Change-Number: 10462 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 15 15:10:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 15 Aug 2018 15:10:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#216?= In-Reply-To: <2056298455.211.1534259406204.JavaMail.jenkins@jenkins.osmocom.org> References: <2056298455.211.1534259406204.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1741121523.223.1534345805949.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.92 KB...] checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 15 16:16:37 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?Tobias_M=C3=A4del?=) Date: Wed, 15 Aug 2018 16:16:37 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10452 to look at the new patch set (#2). Change subject: sdp: remove htonl() from in_addr ...................................................................... sdp: remove htonl() from in_addr Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 --- M src/sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/52/10452/2 -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 16:18:00 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?Tobias_M=C3=A4del?=) Date: Wed, 15 Aug 2018 16:18:00 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Tobias M?del has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: Good idea. I just did that. Should be better now. -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 15 Aug 2018 16:18:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 16:18:00 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?Tobias_M=C3=A4del?=) Date: Wed, 15 Aug 2018 16:18:00 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Tobias M?del has removed Jenkins Builder from this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Removed reviewer Jenkins Builder. -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 16:26:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 16:26:00 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: Code-Review+1 Fine for me now :) -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 15 Aug 2018 16:26:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 16:35:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 16:35:34 +0000 Subject: Change in osmo-sgsn[master]: Drop gprs_msgb_resize_area with libosmocore replacement In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10462 ) Change subject: Drop gprs_msgb_resize_area with libosmocore replacement ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c Gerrit-Change-Number: 10462 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 15 Aug 2018 16:35:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 18:05:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 15 Aug 2018 18:05:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10414 ) Change subject: update DTX fill frame test expectations ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn at 3840 PS1, Line 3840: 52, 53, 54, 55, 56, 57, 58, 5 > this is listing all eitght bursts that are required during DTX on a TCH/F. [?] I have made some changes that I believe align with your suggestions, which I will push here soon. However, the test is still failing with: BTS_Tests.ttcn:3912 Received DTX TCH fill frame with bad frame number: 268 (mod 104: 60) (mod 26: 8) I have read up on the structure and hierarchy of GSM frames, and what you're suggesting now makes a lot of sense to me. But I am still struggling to understand the exact relationship of TCH/F frame numbers sent by osmo-bts and received in TTCN3. For an unrelated AGCH PCH frame, sent by osmo-bts on chan_nr=144 fn=159, I can easily make out the corresponding frame in the TTCN3 test log (the channel matches and the frame number also matches). For TCH/F, when osmo-bts is sending: l1sap.c:805 000160/00/04/07/04 sending fill frame TCH chan_nr=9 fn=160 dtx=enabled then I cannot locate the corresponding frame in the TTCN3 test's log by frame number (even though frame 160 should start a block). However, for this frame: l1sap.c:805 000264/00/04/09/08 sending fill frame TCH chan_nr=9 fn=264 dtx=enabled I can locate a logged message that looks like it corresponds in terms of channel, frame number, and payload: 19:45:38.982505 6 L1CTL_PortType.ttcn:212 dec_L1ctlDlMessageLV(): Decoded @L1CTL_Types.L1ctlDlMessageLV: { len := 39, msg := { header := { msg_type := L1CTL_DATA_IND (3), flags := { padding := '0000000'B, f_done := false }, padding := '0000'O }, dl_info := { chan_nr := { u := { ch0 := RSL_CHAN_NR_Bm_ACCH (1) }, tn := 1 }, link_id := { c := FACCH_SDCCH (0), na := false, prio := SAPI0_PRIO_NORMAL (0), sapi := 0 }, arfcn := { pcs := false, arfcn := 871 }, frame_nr := 264, rx_level := 60, snr := 0, num_biterr := 0, fire_crc := 0 }, payload := { data_ind := { payload := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O } } } } -- To view, visit https://gerrit.osmocom.org/10414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 15 Aug 2018 18:05:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 18:08:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 15 Aug 2018 18:08:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10414 to look at the new patch set (#2). Change subject: update DTX fill frame test expectations ...................................................................... update DTX fill frame test expectations Fix an off-by-one in frame number comparison: Ensure that we won't stop testing until after fn + 104 has been received. The DTX test case would never pass since the alt statement was always repeated even if enough frames had been received. Fix this by moving code which runs before frame fn + 104 is received into an 'else' cause. We receive SACCH frames in DTX mode so we must account for them. Introduce separate counters for SACCH and non-SACCH fill frames to make test failure diagnosis easier. Note that we cannot expect a specific amount of SACCH frames during a particular test run since their amount depends on what the current frame number window happens to be. We can however add the counters for SACCH and non-SACCH fill frames and obtain a meaningful result. Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Related: OS#1950 --- M bts/BTS_Tests.ttcn 1 file changed, 47 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/10414/2 -- To view, visit https://gerrit.osmocom.org/10414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 18:12:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 15 Aug 2018 18:12:31 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10415 to look at the new patch set (#2). Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... send TCH/F fill frames in DTX mode (WIP) Send DTX TCH fill frames according to GSM 05.08, section 8.3. Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Related: OS#1950 --- M src/common/l1sap.c 1 file changed, 64 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/10415/2 -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 15 21:45:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 15 Aug 2018 21:45:45 +0000 Subject: Change in osmocom-bb[master]: trxcon: suppress WARNING log message on NEIGH_PM_REQ In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10432 ) Change subject: trxcon: suppress WARNING log message on NEIGH_PM_REQ ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10432/1/src/host/trxcon/l1ctl.c File src/host/trxcon/l1ctl.c: https://gerrit.osmocom.org/#/c/10432/1/src/host/trxcon/l1ctl.c at 796 PS1, Line 796: case L1CTL_NEIGH_PM_REQ: > I think it makes much more sense to define _L1CTL_MAX, and [?] Ah, nope, sorry. It wouldn't catch unimplemented messages anyway. Probably, setting the log level of "Unknown MSG ..." message to LOGL_NOTICE would make sense... But I am still not sure that adding more L1CTL messages here just to indicate that they are not supported / implemented is not a good idea. After all, it's just a warning message, which doesn't affect the normal operation of this program ;) -- To view, visit https://gerrit.osmocom.org/10432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id76993056fb514e6fb0242d505205316c61bb965 Gerrit-Change-Number: 10432 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 15 Aug 2018 21:45:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 08:58:08 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Aug 2018 08:58:08 +0000 Subject: Change in osmo-bts[master]: measurement: padd missing measurements with educated guess Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10476 Change subject: measurement: padd missing measurements with educated guess ...................................................................... measurement: padd missing measurements with educated guess At the moment the measurement calculation of osmo-bts works by collecting the measurement reports the phy emits during a measurement interval. Normally one would expect a well defind fixed number here, but some phys will not emit a measurement report for lost blocks. Also blocks and their reports may get lost because of cpu overload etc. The computation that is executed at the end of the measurement interval computes over all received measurement. This evenutally means that missing measurements will not taken into account and the result will look better than it is in reality. To fix this, the interval must be of a defined size and in cases where less measurements as expected were collected, the algorithm must make an educated guess by replacing them with a 100%BER at -109dB measurement. - make sure the algorithm works over a fixed interval - replace missing measurements with an educated guess - fix and extend uint-tests Change-Id: Idd30fc07603ad7d042c1fb416e247c3bf7d35c8b Related: OS#2987 --- M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok A tests/meas/meas_testcases.h 4 files changed, 925 insertions(+), 727 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/10476/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 01f1e5d..63bb0fb 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -348,7 +348,10 @@ */ /* compute Osmocom extended measurements for the given lchan */ -static void lchan_meas_compute_extended(struct gsm_lchan *lchan) +static void lchan_meas_compute_extended(struct gsm_lchan *lchan, + unsigned int num_ul_meas_excess, + unsigned int num_ul_meas_expect, + struct bts_ul_meas *m_dummy) { /* we assume that lchan_meas_check_compute() has already computed the mean value * and we can compute the min/max/variance/stddev from this */ @@ -368,8 +371,14 @@ * compensated/pre-empted its transmission */ /* step 1: compute the sum of the squared difference of each value to mean */ - for (i = 0; i < lchan->meas.num_ul_meas; i++) { - struct bts_ul_meas *m = &lchan->meas.uplink[i]; + for (i = 0; i < num_ul_meas_expect; i++) { + struct bts_ul_meas *m; + + if (i < lchan->meas.num_ul_meas) + m = &lchan->meas.uplink[i+num_ul_meas_excess]; + else + m = m_dummy; + int32_t diff = (int32_t)m->ta_offs_256bits - (int32_t)lchan->meas.ms_toa256; /* diff can now be any value of +65535 to -65535, so we can safely square it, * but only in unsigned math. As squaring looses the sign, we can simply drop @@ -385,7 +394,7 @@ lchan->meas.ext.toa256_min = m->ta_offs_256bits; } /* step 2: compute the variance (mean of sum of squared differences) */ - sq_diff_sum = sq_diff_sum / lchan->meas.num_ul_meas; + sq_diff_sum = sq_diff_sum / num_ul_meas_expect; /* as the individual summed values can each not exceed 2^32, and we're * dividing by the number of summands, the resulting value can also not exceed 2^32 */ OSMO_ASSERT(sq_diff_sum <= UINT32_MAX); @@ -394,6 +403,60 @@ lchan->meas.flags |= LC_UL_M_F_OSMO_EXT_VALID; } +/* Get the number of measurements that we expect for a specific lchan. + * (This is a static number that is defined by the specific slot layout of + * the channel) */ +int lchan_meas_num_expected(struct gsm_lchan *lchan) +{ + enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); + + switch (pchan) { + case GSM_PCHAN_TCH_F: + /* 24 for TCH + 1 for SACCH */ + return 25; + case GSM_PCHAN_TCH_H: + /* 24 half-blocks for TCH + 1 for SACCH */ + return 25; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + /* 2 for SDCCH + 1 for SACCH */ + return 3; + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + /* 2 for SDCCH + 1 for SACCH */ + return 3; + default: + return lchan->meas.num_ul_meas; + } +} + +/* In DTX a subset of blocks must always be transmitted + * See also: GSM 05.08, chapter 8.3 Aspects of discontinuous transmission (DTX) */ +int lchan_meas_sub_num_expected(struct gsm_lchan *lchan) +{ + enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); + + switch (pchan) { + case GSM_PCHAN_TCH_F: + /* 1 block SDCCH, 2 blocks TCH */ + return 3; + case GSM_PCHAN_TCH_H: + /* 1 block SDCCH, 4 half-blocks TCH */ + return 5; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + /* no DTX here, all blocks must be present! */ + return 3; + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + /* no DTX here, all blocks must be present! */ + return 3; + default: + return 0; + } +} + + int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn) { struct gsm_meas_rep_unidir *mru; @@ -403,6 +466,12 @@ uint32_t irssi_sub_sum = 0; int32_t ta256b_sum = 0; unsigned int num_meas_sub = 0; + unsigned int num_meas_sub_actual = 0; + unsigned int num_meas_sub_added = 0; + uint8_t num_ul_meas_expect; + uint8_t num_ul_meas_excess = 0; + uint8_t num_meas_sub_expect; + struct bts_ul_meas m_dummy; int i; /* if measurement period is not complete, abort */ @@ -410,14 +479,79 @@ return 0; /* if there are no measurements, skip computation */ - if (lchan->meas.num_ul_meas == 0) + if (lchan->meas.num_ul_meas == 0) { + LOGP(DMEAS, LOGL_ERROR, + "%s Measurement reporting interval ended, but no measurements were collected!\n", + gsm_lchan_name(lchan)); return 0; + } + + LOGP(DMEAS, LOGL_DEBUG, "%s Calculating measurement results for physical channel:%s\n", + gsm_lchan_name(lchan), gsm_pchan_name(ts_pchan(lchan->ts))); + + num_ul_meas_expect = lchan_meas_num_expected(lchan); + if (lchan->meas.num_ul_meas < num_ul_meas_expect) { + /* Note: Some phys will send no measurement indication at all + * when a block is lost. Also in DTX mode blocks are left out + * intentionally to save energy. It is not necessarly an error + * when we get less measurements as we expect. */ + LOGP(DMEAS, LOGL_DEBUG, + "%s Number of UL measurements (%u) is less than expected (%u), will add %u dummy measurements\n", + gsm_lchan_name(lchan), lchan->meas.num_ul_meas, num_ul_meas_expect, num_ul_meas_expect - lchan->meas.num_ul_meas); + } else if (lchan->meas.num_ul_meas > num_ul_meas_expect) { + num_ul_meas_excess = lchan->meas.num_ul_meas - num_ul_meas_expect; + LOGP(DMEAS, LOGL_ERROR, + "%s Number of UL measurements (%u) is more than expected (%u), will discard %u of the oldest measurements\n", + gsm_lchan_name(lchan), lchan->meas.num_ul_meas, num_ul_meas_expect, num_ul_meas_excess); + } else { + LOGP(DMEAS, LOGL_DEBUG, + "%s Number of UL measurements (%u)\n", + gsm_lchan_name(lchan), lchan->meas.num_ul_meas); + } /* compute the actual measurements */ + /* In cases where we have collect less measurements than we expect we + * must assume that we just did not receive the block because it was + * lost due to bad channel conditions. We set up a dummy measurement + * result here that reflects the worst possible result. In our + * calculation we will use this dummy to replace the missing + * measurements */ + m_dummy = (struct bts_ul_meas) { + .ber10k = 10000, /* 100% ber */ + .ta_offs_256bits = 0, + .c_i = 0, + .is_sub = 0, + .inv_rssi = 109 + }; + /* step 1: add up */ - for (i = 0; i < lchan->meas.num_ul_meas; i++) { - struct bts_ul_meas *m = &lchan->meas.uplink[i]; + num_meas_sub_expect = lchan_meas_sub_num_expected(lchan); + for (i = 0; i < num_ul_meas_expect; i++) { + struct bts_ul_meas *m; + + if (i < lchan->meas.num_ul_meas) { + m = &lchan->meas.uplink[i+num_ul_meas_excess]; + /* We may add dummy SUB measurements, for the logtext + * we count the number of SUB measurements that are + * actually contained in the data. */ + if (m->is_sub) + num_meas_sub_actual++; + } else { + m = &m_dummy; + + /* Each measurement interval per definition contains + * a well defined amound of sub measurements. If we + * already padding lost measurements and we find that + * we still miss some sub frames, we set the is_sub + * flag in our dummy measurement right on spot so that + * we get the correct amount of sub measurements when + * the loop ends. */ + if ( num_ul_meas_expect - i <= num_meas_sub_expect - num_meas_sub) { + m->is_sub = 1; + num_meas_sub_added++; + } + } ber_full_sum += m->ber10k; irssi_full_sum += m->inv_rssi; @@ -430,20 +564,44 @@ } } - /* step 2: divide */ - ber_full_sum = ber_full_sum / lchan->meas.num_ul_meas; - irssi_full_sum = irssi_full_sum / lchan->meas.num_ul_meas; - ta256b_sum = ta256b_sum / lchan->meas.num_ul_meas; + /* Check amount of SUB-Frame measurements */ + if (num_meas_sub_actual < num_meas_sub_expect) { + LOGP(DMEAS, LOGL_DEBUG, + "%s Number of SUB measurements (%u) is less than expected (%u), added %u dummy SUB measurements\n", + gsm_lchan_name(lchan), num_meas_sub_actual, num_meas_sub_expect, num_meas_sub_added); + } else if (num_meas_sub_actual > num_meas_sub_expect) { + LOGP(DMEAS, LOGL_ERROR, + "%s Number of SUB measurements (%u) is more than expected (%u)\n", + gsm_lchan_name(lchan), num_meas_sub_actual, num_meas_sub_expect); + } else { + LOGP(DMEAS, LOGL_DEBUG, "%s Number of measurements for SUB (%u)\n", + gsm_lchan_name(lchan), num_meas_sub_actual); + } - if (num_meas_sub) { + /* step 2: divide */ + ber_full_sum = ber_full_sum / num_ul_meas_expect; + irssi_full_sum = irssi_full_sum / num_ul_meas_expect; + ta256b_sum = ta256b_sum / num_ul_meas_expect; + + if (num_meas_sub != num_meas_sub_expect) { + LOGP(DMEAS, LOGL_ERROR, "%s Incorrect number of SUB measurements detected!\n", gsm_lchan_name(lchan)); + /* The only way this can happen is when there are more then + * num_meas_sub_expect-num_meas_sub_expect measurements present + * and not enough of of them are tagged as is_sub, which means + * the logic that tags the measurements works incorrectly. (also + * some unittests trigger this behaviour) For cases where are + * indeed no SUB measurements present we set BER to 100% and + * level to lowest possible. If not enough or too much SUB + * measurements were collected we may move on we continue with + * the wrong amount of SUB measurements. */ + } + + if (!num_meas_sub) { + ber_sub_sum = 10000; /* 100% */ + irssi_sub_sum = 120; /* -120 dBm */ + } else { ber_sub_sum = ber_sub_sum / num_meas_sub; irssi_sub_sum = irssi_sub_sum / num_meas_sub; - } else { - LOGP(DMEAS, LOGL_ERROR, "%s No measurements for SUB!!!\n", gsm_lchan_name(lchan)); - /* The only situation in which this can occur is if the related uplink burst/block was - * missing, so let's set BER to 100% and level to lowest possible. */ - ber_sub_sum = 10000; /* 100% */ - irssi_sub_sum = 120; /* -120 dBm */ } LOGP(DMEAS, LOGL_INFO, "%s Computed TA256(% 4d) BER-FULL(%2u.%02u%%), RSSI-FULL(-%3udBm), " @@ -466,14 +624,15 @@ mru->full.rx_lev, mru->sub.rx_lev, mru->full.rx_qual, - mru->sub.rx_qual, num_meas_sub, lchan->meas.num_ul_meas); + mru->sub.rx_qual, num_meas_sub, num_ul_meas_expect); lchan->meas.flags |= LC_UL_M_F_RES_VALID; - lchan_meas_compute_extended(lchan); + lchan_meas_compute_extended(lchan, num_ul_meas_excess, num_ul_meas_expect, &m_dummy); lchan->meas.num_ul_meas = 0; - /* send a signal indicating computation is complete */ + /* return 1 to indicte that the computation has been done and the next + * interval begins. */ return 1; } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index e889345..69e77aa 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -21,6 +21,8 @@ }; #include "sysmobts_fr_samples.h" +#include "meas_testcases.h" + void test_fn_sample(struct fn_sample *s, unsigned int len, uint8_t pchan, uint8_t tsmap) { @@ -63,161 +65,6 @@ OSMO_ASSERT(tsmap_result == tsmap); } -#define ULM(ber, ta, neg_rssi) \ - { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = 0, .inv_rssi = (neg_rssi) } - -struct meas_testcase { - const char *name; - /* input data */ - const struct bts_ul_meas *ulm; - unsigned int ulm_count; - uint32_t final_fn; - /* results */ - struct { - int success; - uint8_t rx_lev_full; - uint8_t rx_qual_full; - int16_t toa256_mean; - int16_t toa256_min; - int16_t toa256_max; - uint16_t toa256_std_dev; - } res; -}; - -static struct bts_ul_meas ulm1[] = { - ULM(0, 0, 90), - ULM(0, 256, 90), - ULM(0, -256, 90), -}; -static const struct meas_testcase mtc1 = { - .name = "TOA256 Min-Max negative/positive", - .ulm = ulm1, - .ulm_count = ARRAY_SIZE(ulm1), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 256, - .toa256_min = -256, - .toa256_std_dev = 209, - }, -}; - - -static struct bts_ul_meas ulm2[] = { - ULM(0, 256, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 256, 90), -}; -static const struct meas_testcase mtc2 = { - .name = "TOA256 small jitter around 256", - .ulm = ulm2, - .ulm_count = ARRAY_SIZE(ulm2), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 256, - .toa256_max = 258, - .toa256_min = 254, - .toa256_std_dev = 1, - }, -}; - -static struct bts_ul_meas ulm3[] = { - ULM(0, 0, 90), - ULM(0, 0, 80), - ULM(0, 0, 80), - ULM(0, 0, 100), - ULM(0, 0, 100), -}; -static const struct meas_testcase mtc3 = { - .name = "RxLEv averaging", - .ulm = ulm3, - .ulm_count = ARRAY_SIZE(ulm3), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 0, - .toa256_min = 0, - .toa256_std_dev = 0, - }, -}; - -static struct bts_ul_meas ulm4[] = { -}; -static const struct meas_testcase mtc4 = { - .name = "Empty measurements", - .ulm = ulm4, - .ulm_count = ARRAY_SIZE(ulm4), - .final_fn = 25, - .res = { - .success = 0, - .rx_lev_full = 0, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 0, - .toa256_min = 0, - .toa256_std_dev = 0, - }, -}; - -static struct bts_ul_meas ulm5[] = { - /* one 104 multiframe can at max contain 26 blocks (TCH/F), - * each of which can at maximum be 64 bits in advance (TA range) */ - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), -}; -static const struct meas_testcase mtc5 = { - .name = "TOA256 26 blocks with max TOA256", - .ulm = ulm5, - .ulm_count = ARRAY_SIZE(ulm5), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 64*256, - .toa256_max = 64*256, - .toa256_min = 64*256, - .toa256_std_dev = 0, - }, -}; - - static void reset_lchan_meas(struct gsm_lchan *lchan) { lchan->state = LCHAN_S_ACTIVE; @@ -226,13 +73,16 @@ static void test_meas_compute(const struct meas_testcase *mtc) { - struct gsm_lchan *lchan = &trx->ts[1].lchan[0]; + struct gsm_lchan *lchan; unsigned int i; unsigned int fn = 0; - printf("\nMeasurement Compute Test %s\n", mtc->name); + printf("\n\n"); + printf("===========================================================\n"); + printf("Measurement Compute Test: %s\n", mtc->name); - lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan = &trx->ts[mtc->ts].lchan[0]; + lchan->ts->pchan = mtc->pchan; reset_lchan_meas(lchan); /* feed uplink measurements into the code */ @@ -247,6 +97,8 @@ OSMO_ASSERT(!(lchan->meas.flags & LC_UL_M_F_RES_VALID)); } else { OSMO_ASSERT(lchan->meas.flags & (LC_UL_M_F_RES_VALID|LC_UL_M_F_OSMO_EXT_VALID)); + printf("number of measurements: %u\n", mtc->ulm_count); + printf("parameter | actual | expected\n"); printf("meas.ext.toa256_min | %6d | %6d\n", lchan->meas.ext.toa256_min, mtc->res.toa256_min); printf("meas.ext.toa256_max | %6d | %6d\n", @@ -266,6 +118,7 @@ (lchan->meas.ext.toa256_std_dev != mtc->res.toa256_std_dev) || (lchan->meas.ul_res.full.rx_lev != mtc->res.rx_lev_full)) { fprintf(stderr, "%s: Unexpected measurement result!\n", mtc->name); + OSMO_ASSERT(false); } } @@ -296,7 +149,7 @@ fprintf(stderr, "unable to to open bts\n"); exit(1); } - +#if 0 printf("\n"); printf("***********************\n"); printf("*** FULL RATE TESTS ***\n"); @@ -306,12 +159,14 @@ test_fn_sample(test_fn_tch_f_ts_2_3, ARRAY_SIZE(test_fn_tch_f_ts_2_3), GSM_PCHAN_TCH_F, (1 << 2) | (1 << 3)); test_fn_sample(test_fn_tch_f_ts_4_5, ARRAY_SIZE(test_fn_tch_f_ts_4_5), GSM_PCHAN_TCH_F, (1 << 4) | (1 << 5)); test_fn_sample(test_fn_tch_f_ts_6_7, ARRAY_SIZE(test_fn_tch_f_ts_6_7), GSM_PCHAN_TCH_F, (1 << 6) | (1 << 7)); - +#endif +#if 0 printf("\n"); printf("***********************\n"); printf("*** HALF RATE TESTS ***\n"); printf("***********************\n"); + /* Test half rate */ test_fn_sample(test_fn_tch_h_ts_2_ss0_ss1, ARRAY_SIZE(test_fn_tch_h_ts_2_ss0_ss1), GSM_PCHAN_TCH_H, (1 << 2)); test_fn_sample(test_fn_tch_h_ts_3_ss0_ss1, ARRAY_SIZE(test_fn_tch_h_ts_3_ss0_ss1), GSM_PCHAN_TCH_H, (1 << 3)); @@ -319,12 +174,23 @@ test_fn_sample(test_fn_tch_h_ts_5_ss0_ss1, ARRAY_SIZE(test_fn_tch_h_ts_5_ss0_ss1), GSM_PCHAN_TCH_H, (1 << 5)); test_fn_sample(test_fn_tch_h_ts_6_ss0_ss1, ARRAY_SIZE(test_fn_tch_h_ts_6_ss0_ss1), GSM_PCHAN_TCH_H, (1 << 6)); test_fn_sample(test_fn_tch_h_ts_7_ss0_ss1, ARRAY_SIZE(test_fn_tch_h_ts_7_ss0_ss1), GSM_PCHAN_TCH_H, (1 << 7)); +#endif + test_meas_compute(&mtc1); test_meas_compute(&mtc2); test_meas_compute(&mtc3); test_meas_compute(&mtc4); test_meas_compute(&mtc5); + test_meas_compute(&mtc_tch_f_complete); + test_meas_compute(&mtc_tch_f_dtx_with_lost_subs); + test_meas_compute(&mtc_tch_f_dtx); + test_meas_compute(&mtc_tch_h_complete); + test_meas_compute(&mtc_tch_h_dtx_with_lost_subs); + test_meas_compute(&mtc_tch_h_dtx); + test_meas_compute(&mtc_overrun); + test_meas_compute(&mtc_sdcch4_complete); + test_meas_compute(&mtc_sdcch8_complete); printf("Success\n"); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 026899d..54ad110 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -1,572 +1,157 @@ -*********************** -*** FULL RATE TESTS *** -*********************** - =========================================================== -Testing: ts[2]->lchan[0], fn=10958=>010958/08/12/44/50, fn%104=38, rc=1, delta=10958 -Testing: ts[2]->lchan[0], fn=11062=>011062/08/12/46/02, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[0], fn=11166=>011166/08/12/48/02, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[0], fn=11270=>011270/08/12/50/06, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[0], fn=11374=>011374/08/12/01/06, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[0], fn=11478=>011478/08/12/03/06, fn%104=38, rc=1, delta=104 -Testing: ts[3]->lchan[0], fn=11491=>011491/08/25/16/19, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11582=>011582/08/12/05/10, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=11595=>011595/08/25/18/23, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11686=>011686/08/12/07/10, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=11699=>011699/08/25/20/23, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11790=>011790/08/12/09/14, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=11803=>011803/08/25/22/27, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11894=>011894/08/12/11/14, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=11907=>011907/08/25/24/27, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11998=>011998/09/12/13/14, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=12011=>012011/09/25/26/27, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=12102=>012102/09/12/15/18, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=12115=>012115/09/25/28/31, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=12206=>012206/09/12/17/18, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=12219=>012219/09/25/30/31, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=12310=>012310/09/12/19/22, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=12323=>012323/09/25/32/35, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=12414=>012414/09/12/21/22, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=12427=>012427/09/25/34/35, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=12518=>012518/09/12/23/22, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=12531=>012531/09/25/36/35, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=12622=>012622/09/12/25/26, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[0], fn=12635=>012635/09/25/38/39, fn%104=51, rc=1, delta=13 - - -=========================================================== -Testing: ts[4]->lchan[0], fn=5888=>005888/04/12/23/00, fn%104=64, rc=1, delta=5888 -Testing: ts[4]->lchan[0], fn=5992=>005992/04/12/25/00, fn%104=64, rc=1, delta=104 -Testing: ts[4]->lchan[0], fn=6096=>006096/04/12/27/00, fn%104=64, rc=1, delta=104 -Testing: ts[4]->lchan[0], fn=6200=>006200/04/12/29/04, fn%104=64, rc=1, delta=104 -Testing: ts[5]->lchan[0], fn=6213=>006213/04/25/42/17, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=6304=>006304/04/12/31/04, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=6317=>006317/04/25/44/17, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=6408=>006408/04/12/33/08, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=6421=>006421/04/25/46/21, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=6512=>006512/04/12/35/08, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=6525=>006525/04/25/48/21, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=6616=>006616/04/12/37/08, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=6629=>006629/04/25/50/21, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=6720=>006720/05/12/39/12, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=6733=>006733/05/25/01/25, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=6824=>006824/05/12/41/12, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=6837=>006837/05/25/03/25, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=6928=>006928/05/12/43/16, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=6941=>006941/05/25/05/29, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7032=>007032/05/12/45/16, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7045=>007045/05/25/07/29, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7136=>007136/05/12/47/16, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7149=>007149/05/25/09/29, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7240=>007240/05/12/49/20, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7253=>007253/05/25/11/33, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7344=>007344/05/12/00/20, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7357=>007357/05/25/13/33, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7448=>007448/05/12/02/24, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7461=>007461/05/25/15/37, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7552=>007552/05/12/04/24, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7565=>007565/05/25/17/37, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7656=>007656/05/12/06/24, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7669=>007669/05/25/19/37, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7760=>007760/05/12/08/28, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7773=>007773/05/25/21/41, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7864=>007864/05/12/10/28, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7877=>007877/05/25/23/41, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=7968=>007968/06/12/12/32, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=7981=>007981/06/25/25/45, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8072=>008072/06/12/14/32, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8085=>008085/06/25/27/45, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8176=>008176/06/12/16/32, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8189=>008189/06/25/29/45, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8280=>008280/06/12/18/36, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8293=>008293/06/25/31/49, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8384=>008384/06/12/20/36, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8397=>008397/06/25/33/49, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8488=>008488/06/12/22/40, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8501=>008501/06/25/35/01, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8592=>008592/06/12/24/40, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8605=>008605/06/25/37/01, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8696=>008696/06/12/26/40, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8709=>008709/06/25/39/05, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8800=>008800/06/12/28/44, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8813=>008813/06/25/41/05, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8904=>008904/06/12/30/44, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=8917=>008917/06/25/43/05, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9008=>009008/06/12/32/48, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=9021=>009021/06/25/45/09, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9112=>009112/06/12/34/48, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=9125=>009125/06/25/47/09, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9216=>009216/06/12/36/00, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=9229=>009229/06/25/49/13, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9320=>009320/07/12/38/00, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=9333=>009333/07/25/00/13, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9424=>009424/07/12/40/00, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=9437=>009437/07/25/02/13, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9528=>009528/07/12/42/04, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=9541=>009541/07/25/04/17, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9632=>009632/07/12/44/04, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[0], fn=9645=>009645/07/25/06/17, fn%104=77, rc=1, delta=13 - - -=========================================================== -Testing: ts[6]->lchan[0], fn=8618=>008618/06/12/50/14, fn%104=90, rc=1, delta=8618 -Testing: ts[6]->lchan[0], fn=8722=>008722/06/12/01/18, fn%104=90, rc=1, delta=104 -Testing: ts[6]->lchan[0], fn=8826=>008826/06/12/03/18, fn%104=90, rc=1, delta=104 -Testing: ts[6]->lchan[0], fn=8930=>008930/06/12/05/18, fn%104=90, rc=1, delta=104 -Testing: ts[7]->lchan[0], fn=8943=>008943/06/25/18/31, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9034=>009034/06/12/07/22, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9047=>009047/06/25/20/35, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9138=>009138/06/12/09/22, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9151=>009151/06/25/22/35, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9242=>009242/06/12/11/26, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9255=>009255/06/25/24/39, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9346=>009346/07/12/13/26, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9359=>009359/07/25/26/39, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9450=>009450/07/12/15/26, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9463=>009463/07/25/28/39, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9554=>009554/07/12/17/30, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9567=>009567/07/25/30/43, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9658=>009658/07/12/19/30, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9671=>009671/07/25/32/43, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9762=>009762/07/12/21/34, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9775=>009775/07/25/34/47, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9866=>009866/07/12/23/34, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9879=>009879/07/25/36/47, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9970=>009970/07/12/25/34, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=9983=>009983/07/25/38/47, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10074=>010074/07/12/27/38, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10087=>010087/07/25/40/51, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10178=>010178/07/12/29/38, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10191=>010191/07/25/42/51, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10282=>010282/07/12/31/42, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10295=>010295/07/25/44/03, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10386=>010386/07/12/33/42, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10399=>010399/07/25/46/03, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10490=>010490/07/12/35/42, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10503=>010503/07/25/48/07, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10594=>010594/07/12/37/46, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10607=>010607/07/25/50/07, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10698=>010698/08/12/39/46, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10711=>010711/08/25/01/07, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10802=>010802/08/12/41/50, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10815=>010815/08/25/03/11, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10906=>010906/08/12/43/50, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=10919=>010919/08/25/05/11, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11010=>011010/08/12/45/02, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11023=>011023/08/25/07/15, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11114=>011114/08/12/47/02, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11127=>011127/08/25/09/15, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11218=>011218/08/12/49/02, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11231=>011231/08/25/11/15, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11322=>011322/08/12/00/06, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11335=>011335/08/25/13/19, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11426=>011426/08/12/02/06, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11439=>011439/08/25/15/19, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11530=>011530/08/12/04/10, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11543=>011543/08/25/17/23, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11634=>011634/08/12/06/10, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11647=>011647/08/25/19/23, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11738=>011738/08/12/08/10, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11751=>011751/08/25/21/23, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11842=>011842/08/12/10/14, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11855=>011855/08/25/23/27, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11946=>011946/09/12/12/14, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=11959=>011959/09/25/25/27, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=12050=>012050/09/12/14/18, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=12063=>012063/09/25/27/31, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=12154=>012154/09/12/16/18, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[0], fn=12167=>012167/09/25/29/31, fn%104=103, rc=1, delta=13 - -*********************** -*** HALF RATE TESTS *** -*********************** - - -=========================================================== -Testing: ts[2]->lchan[0], fn=8982=>008982/06/12/06/22, fn%104=38, rc=1, delta=8982 -Testing: ts[2]->lchan[0], fn=9086=>009086/06/12/08/22, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[0], fn=9190=>009190/06/12/10/22, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[0], fn=9294=>009294/07/12/12/26, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[0], fn=9398=>009398/07/12/14/26, fn%104=38, rc=1, delta=104 -Testing: ts[2]->lchan[1], fn=9411=>009411/07/25/27/39, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=9502=>009502/07/12/16/30, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=9515=>009515/07/25/29/43, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=9606=>009606/07/12/18/30, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=9619=>009619/07/25/31/43, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=9710=>009710/07/12/20/30, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=9723=>009723/07/25/33/43, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=9814=>009814/07/12/22/34, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=9827=>009827/07/25/35/47, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=9918=>009918/07/12/24/34, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=9931=>009931/07/25/37/47, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10022=>010022/07/12/26/38, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10035=>010035/07/25/39/51, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10126=>010126/07/12/28/38, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10139=>010139/07/25/41/51, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10230=>010230/07/12/30/38, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10243=>010243/07/25/43/03, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10334=>010334/07/12/32/42, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10347=>010347/07/25/45/03, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10438=>010438/07/12/34/42, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10451=>010451/07/25/47/03, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10542=>010542/07/12/36/46, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10555=>010555/07/25/49/07, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10646=>010646/08/12/38/46, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10659=>010659/08/25/00/07, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10750=>010750/08/12/40/46, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10763=>010763/08/25/02/11, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10854=>010854/08/12/42/50, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10867=>010867/08/25/04/11, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=10958=>010958/08/12/44/50, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=10971=>010971/08/25/06/11, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11062=>011062/08/12/46/02, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=11075=>011075/08/25/08/15, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11166=>011166/08/12/48/02, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=11179=>011179/08/25/10/15, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11270=>011270/08/12/50/06, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=11283=>011283/08/25/12/19, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11374=>011374/08/12/01/06, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=11387=>011387/08/25/14/19, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11478=>011478/08/12/03/06, fn%104=38, rc=1, delta=91 -Testing: ts[2]->lchan[1], fn=11491=>011491/08/25/16/19, fn%104=51, rc=1, delta=13 -Testing: ts[2]->lchan[0], fn=11582=>011582/08/12/05/10, fn%104=38, rc=1, delta=91 - - -=========================================================== -Testing: ts[3]->lchan[0], fn=10022=>010022/07/12/26/38, fn%104=38, rc=1, delta=10022 -Testing: ts[3]->lchan[1], fn=10035=>010035/07/25/39/51, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10126=>010126/07/12/28/38, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10139=>010139/07/25/41/51, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10230=>010230/07/12/30/38, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10243=>010243/07/25/43/03, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10334=>010334/07/12/32/42, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10347=>010347/07/25/45/03, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10438=>010438/07/12/34/42, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10451=>010451/07/25/47/03, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10542=>010542/07/12/36/46, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10555=>010555/07/25/49/07, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10646=>010646/08/12/38/46, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10659=>010659/08/25/00/07, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10750=>010750/08/12/40/46, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10763=>010763/08/25/02/11, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10854=>010854/08/12/42/50, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10867=>010867/08/25/04/11, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=10958=>010958/08/12/44/50, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=10971=>010971/08/25/06/11, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11062=>011062/08/12/46/02, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11075=>011075/08/25/08/15, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11166=>011166/08/12/48/02, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11179=>011179/08/25/10/15, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11270=>011270/08/12/50/06, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11283=>011283/08/25/12/19, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11374=>011374/08/12/01/06, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11387=>011387/08/25/14/19, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11478=>011478/08/12/03/06, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11491=>011491/08/25/16/19, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11582=>011582/08/12/05/10, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11595=>011595/08/25/18/23, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11686=>011686/08/12/07/10, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11699=>011699/08/25/20/23, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11790=>011790/08/12/09/14, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11803=>011803/08/25/22/27, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11894=>011894/08/12/11/14, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=11907=>011907/08/25/24/27, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=11998=>011998/09/12/13/14, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=12011=>012011/09/25/26/27, fn%104=51, rc=1, delta=13 -Testing: ts[3]->lchan[0], fn=12102=>012102/09/12/15/18, fn%104=38, rc=1, delta=91 -Testing: ts[3]->lchan[1], fn=12115=>012115/09/25/28/31, fn%104=51, rc=1, delta=13 - - -=========================================================== -Testing: ts[4]->lchan[0], fn=7760=>007760/05/12/08/28, fn%104=64, rc=1, delta=7760 -Testing: ts[4]->lchan[0], fn=7864=>007864/05/12/10/28, fn%104=64, rc=1, delta=104 -Testing: ts[4]->lchan[0], fn=7968=>007968/06/12/12/32, fn%104=64, rc=1, delta=104 -Testing: ts[4]->lchan[0], fn=8072=>008072/06/12/14/32, fn%104=64, rc=1, delta=104 -Testing: ts[4]->lchan[0], fn=8176=>008176/06/12/16/32, fn%104=64, rc=1, delta=104 -Testing: ts[4]->lchan[1], fn=8189=>008189/06/25/29/45, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8280=>008280/06/12/18/36, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=8293=>008293/06/25/31/49, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8384=>008384/06/12/20/36, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=8397=>008397/06/25/33/49, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8488=>008488/06/12/22/40, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=8501=>008501/06/25/35/01, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8592=>008592/06/12/24/40, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=8605=>008605/06/25/37/01, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8696=>008696/06/12/26/40, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=8709=>008709/06/25/39/05, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8800=>008800/06/12/28/44, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=8813=>008813/06/25/41/05, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=8904=>008904/06/12/30/44, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=8917=>008917/06/25/43/05, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9008=>009008/06/12/32/48, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9021=>009021/06/25/45/09, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9112=>009112/06/12/34/48, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9125=>009125/06/25/47/09, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9216=>009216/06/12/36/00, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9229=>009229/06/25/49/13, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9320=>009320/07/12/38/00, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9333=>009333/07/25/00/13, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9424=>009424/07/12/40/00, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9437=>009437/07/25/02/13, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9528=>009528/07/12/42/04, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9541=>009541/07/25/04/17, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9632=>009632/07/12/44/04, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9645=>009645/07/25/06/17, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9736=>009736/07/12/46/08, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9749=>009749/07/25/08/21, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9840=>009840/07/12/48/08, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9853=>009853/07/25/10/21, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=9944=>009944/07/12/50/08, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=9957=>009957/07/25/12/21, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10048=>010048/07/12/01/12, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10061=>010061/07/25/14/25, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10152=>010152/07/12/03/12, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10165=>010165/07/25/16/25, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10256=>010256/07/12/05/16, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10269=>010269/07/25/18/29, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10360=>010360/07/12/07/16, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10373=>010373/07/25/20/29, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10464=>010464/07/12/09/16, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10477=>010477/07/25/22/29, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10568=>010568/07/12/11/20, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10581=>010581/07/25/24/33, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10672=>010672/08/12/13/20, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10685=>010685/08/25/26/33, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10776=>010776/08/12/15/24, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10789=>010789/08/25/28/37, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10880=>010880/08/12/17/24, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10893=>010893/08/25/30/37, fn%104=77, rc=1, delta=13 -Testing: ts[4]->lchan[0], fn=10984=>010984/08/12/19/24, fn%104=64, rc=1, delta=91 -Testing: ts[4]->lchan[1], fn=10997=>010997/08/25/32/37, fn%104=77, rc=1, delta=13 - - -=========================================================== -Testing: ts[5]->lchan[0], fn=5264=>005264/03/12/11/40, fn%104=64, rc=1, delta=5264 -Testing: ts[5]->lchan[0], fn=5368=>005368/04/12/13/40, fn%104=64, rc=1, delta=104 -Testing: ts[5]->lchan[0], fn=5472=>005472/04/12/15/44, fn%104=64, rc=1, delta=104 -Testing: ts[5]->lchan[0], fn=5576=>005576/04/12/17/44, fn%104=64, rc=1, delta=104 -Testing: ts[5]->lchan[0], fn=5680=>005680/04/12/19/48, fn%104=64, rc=1, delta=104 -Testing: ts[5]->lchan[1], fn=5693=>005693/04/25/32/09, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=5784=>005784/04/12/21/48, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=5797=>005797/04/25/34/09, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=5888=>005888/04/12/23/00, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=5901=>005901/04/25/36/13, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=5992=>005992/04/12/25/00, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6005=>006005/04/25/38/13, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6096=>006096/04/12/27/00, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6109=>006109/04/25/40/13, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6200=>006200/04/12/29/04, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6213=>006213/04/25/42/17, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6304=>006304/04/12/31/04, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6317=>006317/04/25/44/17, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6408=>006408/04/12/33/08, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6421=>006421/04/25/46/21, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6512=>006512/04/12/35/08, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6525=>006525/04/25/48/21, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6616=>006616/04/12/37/08, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6629=>006629/04/25/50/21, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6720=>006720/05/12/39/12, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6733=>006733/05/25/01/25, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6824=>006824/05/12/41/12, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6837=>006837/05/25/03/25, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=6928=>006928/05/12/43/16, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=6941=>006941/05/25/05/29, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7032=>007032/05/12/45/16, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7045=>007045/05/25/07/29, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7136=>007136/05/12/47/16, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7149=>007149/05/25/09/29, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7240=>007240/05/12/49/20, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7253=>007253/05/25/11/33, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7344=>007344/05/12/00/20, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7357=>007357/05/25/13/33, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7448=>007448/05/12/02/24, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7461=>007461/05/25/15/37, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7552=>007552/05/12/04/24, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7565=>007565/05/25/17/37, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7656=>007656/05/12/06/24, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7669=>007669/05/25/19/37, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7760=>007760/05/12/08/28, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7773=>007773/05/25/21/41, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7864=>007864/05/12/10/28, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7877=>007877/05/25/23/41, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=7968=>007968/06/12/12/32, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=7981=>007981/06/25/25/45, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=8072=>008072/06/12/14/32, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=8085=>008085/06/25/27/45, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=8176=>008176/06/12/16/32, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=8189=>008189/06/25/29/45, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=8280=>008280/06/12/18/36, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=8293=>008293/06/25/31/49, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=8384=>008384/06/12/20/36, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=8397=>008397/06/25/33/49, fn%104=77, rc=1, delta=13 -Testing: ts[5]->lchan[0], fn=8488=>008488/06/12/22/40, fn%104=64, rc=1, delta=91 -Testing: ts[5]->lchan[1], fn=8501=>008501/06/25/35/01, fn%104=77, rc=1, delta=13 - - -=========================================================== -Testing: ts[6]->lchan[0], fn=8098=>008098/06/12/40/06, fn%104=90, rc=1, delta=8098 -Testing: ts[6]->lchan[0], fn=8202=>008202/06/12/42/10, fn%104=90, rc=1, delta=104 -Testing: ts[6]->lchan[0], fn=8306=>008306/06/12/44/10, fn%104=90, rc=1, delta=104 -Testing: ts[6]->lchan[0], fn=8410=>008410/06/12/46/10, fn%104=90, rc=1, delta=104 -Testing: ts[6]->lchan[1], fn=8423=>008423/06/25/08/23, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=8514=>008514/06/12/48/14, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=8527=>008527/06/25/10/27, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=8618=>008618/06/12/50/14, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=8631=>008631/06/25/12/27, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=8722=>008722/06/12/01/18, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=8735=>008735/06/25/14/31, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=8826=>008826/06/12/03/18, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=8839=>008839/06/25/16/31, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=8930=>008930/06/12/05/18, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=8943=>008943/06/25/18/31, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9034=>009034/06/12/07/22, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9047=>009047/06/25/20/35, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9138=>009138/06/12/09/22, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9151=>009151/06/25/22/35, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9242=>009242/06/12/11/26, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9255=>009255/06/25/24/39, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9346=>009346/07/12/13/26, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9359=>009359/07/25/26/39, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9450=>009450/07/12/15/26, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9463=>009463/07/25/28/39, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9554=>009554/07/12/17/30, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9567=>009567/07/25/30/43, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9658=>009658/07/12/19/30, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9671=>009671/07/25/32/43, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9762=>009762/07/12/21/34, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9775=>009775/07/25/34/47, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9866=>009866/07/12/23/34, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9879=>009879/07/25/36/47, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=9970=>009970/07/12/25/34, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=9983=>009983/07/25/38/47, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10074=>010074/07/12/27/38, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10087=>010087/07/25/40/51, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10178=>010178/07/12/29/38, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10191=>010191/07/25/42/51, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10282=>010282/07/12/31/42, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10295=>010295/07/25/44/03, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10386=>010386/07/12/33/42, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10399=>010399/07/25/46/03, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10490=>010490/07/12/35/42, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10503=>010503/07/25/48/07, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10594=>010594/07/12/37/46, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10607=>010607/07/25/50/07, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10698=>010698/08/12/39/46, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10711=>010711/08/25/01/07, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10802=>010802/08/12/41/50, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10815=>010815/08/25/03/11, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=10906=>010906/08/12/43/50, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=10919=>010919/08/25/05/11, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11010=>011010/08/12/45/02, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=11023=>011023/08/25/07/15, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11114=>011114/08/12/47/02, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=11127=>011127/08/25/09/15, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11218=>011218/08/12/49/02, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=11231=>011231/08/25/11/15, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11322=>011322/08/12/00/06, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=11335=>011335/08/25/13/19, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11426=>011426/08/12/02/06, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=11439=>011439/08/25/15/19, fn%104=103, rc=1, delta=13 -Testing: ts[6]->lchan[0], fn=11530=>011530/08/12/04/10, fn%104=90, rc=1, delta=91 -Testing: ts[6]->lchan[1], fn=11543=>011543/08/25/17/23, fn%104=103, rc=1, delta=13 - - -=========================================================== -Testing: ts[7]->lchan[0], fn=11738=>011738/08/12/08/10, fn%104=90, rc=1, delta=11738 -Testing: ts[7]->lchan[0], fn=11842=>011842/08/12/10/14, fn%104=90, rc=1, delta=104 -Testing: ts[7]->lchan[0], fn=11946=>011946/09/12/12/14, fn%104=90, rc=1, delta=104 -Testing: ts[7]->lchan[0], fn=12050=>012050/09/12/14/18, fn%104=90, rc=1, delta=104 -Testing: ts[7]->lchan[1], fn=12063=>012063/09/25/27/31, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12154=>012154/09/12/16/18, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12167=>012167/09/25/29/31, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12258=>012258/09/12/18/18, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12271=>012271/09/25/31/31, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12362=>012362/09/12/20/22, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12375=>012375/09/25/33/35, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12466=>012466/09/12/22/22, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12479=>012479/09/25/35/35, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12570=>012570/09/12/24/26, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12583=>012583/09/25/37/39, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12674=>012674/09/12/26/26, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12687=>012687/09/25/39/39, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12778=>012778/09/12/28/26, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12791=>012791/09/25/41/39, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12882=>012882/09/12/30/30, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12895=>012895/09/25/43/43, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=12986=>012986/09/12/32/30, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=12999=>012999/09/25/45/43, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13090=>013090/09/12/34/34, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13103=>013103/09/25/47/47, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13194=>013194/09/12/36/34, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13207=>013207/09/25/49/47, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13298=>013298/10/12/38/34, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13311=>013311/10/25/00/47, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13402=>013402/10/12/40/38, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13415=>013415/10/25/02/51, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13506=>013506/10/12/42/38, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13519=>013519/10/25/04/51, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13610=>013610/10/12/44/42, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13623=>013623/10/25/06/03, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13714=>013714/10/12/46/42, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13727=>013727/10/25/08/03, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13818=>013818/10/12/48/42, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13831=>013831/10/25/10/07, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=13922=>013922/10/12/50/46, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=13935=>013935/10/25/12/07, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14026=>014026/10/12/01/46, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14039=>014039/10/25/14/07, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14130=>014130/10/12/03/50, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14143=>014143/10/25/16/11, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14234=>014234/10/12/05/50, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14247=>014247/10/25/18/11, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14338=>014338/10/12/07/02, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14351=>014351/10/25/20/15, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14442=>014442/10/12/09/02, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14455=>014455/10/25/22/15, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14546=>014546/10/12/11/02, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14559=>014559/10/25/24/15, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14650=>014650/11/12/13/06, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14663=>014663/11/25/26/19, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14754=>014754/11/12/15/06, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14767=>014767/11/25/28/19, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14858=>014858/11/12/17/10, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14871=>014871/11/25/30/23, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=14962=>014962/11/12/19/10, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=14975=>014975/11/25/32/23, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=15066=>015066/11/12/21/10, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=15079=>015079/11/25/34/23, fn%104=103, rc=1, delta=13 -Testing: ts[7]->lchan[0], fn=15170=>015170/11/12/23/14, fn%104=90, rc=1, delta=91 -Testing: ts[7]->lchan[1], fn=15183=>015183/11/25/36/27, fn%104=103, rc=1, delta=13 - -Measurement Compute Test TOA256 Min-Max negative/positive +Measurement Compute Test: TOA256 Min-Max negative/positive +number of measurements: 25 +parameter | actual | expected meas.ext.toa256_min | -256 | -256 meas.ext.toa256_max | 256 | 256 meas.ms_toa256 | 0 | 0 -meas.ext.toa256_std_dev | 209 | 209 +meas.ext.toa256_std_dev | 250 | 250 meas.ul_res.full.rx_lev | 20 | 20 meas.ul_res.full.rx_qual | 0 | 0 -Measurement Compute Test TOA256 small jitter around 256 + +=========================================================== +Measurement Compute Test: TOA256 small jitter around 256 +number of measurements: 25 +parameter | actual | expected meas.ext.toa256_min | 254 | 254 meas.ext.toa256_max | 258 | 258 meas.ms_toa256 | 256 | 256 meas.ext.toa256_std_dev | 1 | 1 meas.ul_res.full.rx_lev | 20 | 20 -meas.ul_res.full.rx_qual | 0 | 0 +meas.ul_res.full.rx_qual | 0 | 7 -Measurement Compute Test RxLEv averaging + +=========================================================== +Measurement Compute Test: RxLEv averaging +number of measurements: 5 +parameter | actual | expected meas.ext.toa256_min | 0 | 0 meas.ext.toa256_max | 0 | 0 meas.ms_toa256 | 0 | 0 meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 5 | 5 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: Empty measurements + + +=========================================================== +Measurement Compute Test: TOA256 26 blocks with max TOA256 +number of measurements: 26 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 meas.ul_res.full.rx_lev | 20 | 20 meas.ul_res.full.rx_qual | 0 | 0 -Measurement Compute Test Empty measurements -Measurement Compute Test TOA256 26 blocks with max TOA256 +=========================================================== +Measurement Compute Test: Complete TCH/F measurement period (26 measurements, 3 sub-frames) +number of measurements: 25 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Incomplete TCH/F measurement period (16 measurements, 1 sub-frame) +number of measurements: 16 +parameter | actual | expected +meas.ext.toa256_min | 0 | 0 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 10485 | 10485 +meas.ext.toa256_std_dev | 7864 | 7864 +meas.ul_res.full.rx_lev | 14 | 14 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: Incomplete but normal TCH/F measurement period (16 measurements, 3 sub-frames) +number of measurements: 16 +parameter | actual | expected +meas.ext.toa256_min | 0 | 0 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 10485 | 10485 +meas.ext.toa256_std_dev | 7864 | 7864 +meas.ul_res.full.rx_lev | 14 | 14 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: Complete TCH/H measurement period (26 measurements, 5 sub-frames) +number of measurements: 25 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Incomplete TCH/H measurement period (14 measurements, 3 sub-frames) +number of measurements: 14 +parameter | actual | expected +meas.ext.toa256_min | 0 | 0 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 9175 | 9175 +meas.ext.toa256_std_dev | 8132 | 8132 +meas.ul_res.full.rx_lev | 12 | 12 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: Incomplete but normal TCH/F measurement period (16 measurements, 5 sub-frames) +number of measurements: 16 +parameter | actual | expected +meas.ext.toa256_min | 0 | 0 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 10485 | 10485 +meas.ext.toa256_std_dev | 7864 | 7864 +meas.ul_res.full.rx_lev | 14 | 14 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: TCH/F measurement period with too much measurement values (overrun) +number of measurements: 59 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Complete SDCCH4 measurement period (3 measurements) +number of measurements: 3 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Complete SDCCH8 measurement period (3 measurements) +number of measurements: 3 +parameter | actual | expected meas.ext.toa256_min | 16384 | 16384 meas.ext.toa256_max | 16384 | 16384 meas.ms_toa256 | 16384 | 16384 diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h new file mode 100644 index 0000000..ecd5292 --- /dev/null +++ b/tests/meas/meas_testcases.h @@ -0,0 +1,588 @@ +#pragma once + +#define ULM(ber, ta, sub, neg_rssi) \ + { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = sub, .inv_rssi = (neg_rssi) } + +struct meas_testcase { + const char *name; + /* input data */ + const struct bts_ul_meas *ulm; + unsigned int ulm_count; + uint32_t final_fn; + uint8_t ts; + enum gsm_phys_chan_config pchan; + /* results */ + struct { + int success; + uint8_t rx_lev_full; + uint8_t rx_qual_full; + int16_t toa256_mean; + int16_t toa256_min; + int16_t toa256_max; + uint16_t toa256_std_dev; + } res; +}; + +static struct bts_ul_meas ulm1[] = { + /* Note: The assumptions about the frame number and the subset + * allegiance is random since for the calculation only the amount + * is of relevance. This is true for all following testcases */ + ULM(0, 0, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 1, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 1, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 1, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), + ULM(0, -256, 0, 90), +}; +static const struct meas_testcase mtc1 = { + .name = "TOA256 Min-Max negative/positive", + .ulm = ulm1, + .ulm_count = ARRAY_SIZE(ulm1), + .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 256, + .toa256_min = -256, + .toa256_std_dev = 250, + }, +}; + +static struct bts_ul_meas ulm2[] = { + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 1, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 1, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 256, 1, 90), + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), +}; +static const struct meas_testcase mtc2 = { + .name = "TOA256 small jitter around 256", + .ulm = ulm2, + .ulm_count = ARRAY_SIZE(ulm2), + .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 7, + .toa256_mean = 256, + .toa256_max = 258, + .toa256_min = 254, + .toa256_std_dev = 1, + }, +}; + +static struct bts_ul_meas ulm3[] = { + ULM(0, 0, 0, 90), + ULM(0, 0, 0, 80), + ULM(0, 0, 0, 80), + ULM(0, 0, 0, 100), + ULM(0, 0, 0, 100), +}; +static const struct meas_testcase mtc3 = { + .name = "RxLEv averaging", + .ulm = ulm3, + .ulm_count = ARRAY_SIZE(ulm3), + .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 5, + .rx_qual_full = 7, + .toa256_mean = 0, + .toa256_max = 0, + .toa256_min = 0, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm4[] = {}; +static const struct meas_testcase mtc4 = { + .name = "Empty measurements", + .ulm = ulm4, + .ulm_count = ARRAY_SIZE(ulm4), + .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 0, + .rx_lev_full = 0, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 0, + .toa256_min = 0, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm5[] = { + /* one 104 multiframe can at max contain 26 blocks (TCH/F), + * each of which can at maximum be 64 bits in advance (TA range) */ + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; +static const struct meas_testcase mtc5 = { + .name = "TOA256 26 blocks with max TOA256", + .ulm = ulm5, + .ulm_count = ARRAY_SIZE(ulm5), + .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; + +/* This testcase models a good case as we can see it when all TCH + * and SACCH blocks are received */ +static struct bts_ul_meas ulm_tch_f_complete[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; +static const struct meas_testcase mtc_tch_f_complete = { + .name = "Complete TCH/F measurement period (26 measurements, 3 sub-frames)", + .ulm = ulm_tch_f_complete, + .ulm_count = ARRAY_SIZE(ulm_tch_f_complete), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; + +/* This testcase models an error case where two of 3 expected sub measurements + * are lost. The calculation logic must detect this and replace those + * measurements. Note that this example also lacks some blocks due to DTX, + * which is normal. */ +static struct bts_ul_meas ulm_tch_f_dtx_with_lost_subs[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; +static const struct meas_testcase mtc_tch_f_dtx_with_lost_subs = { + /* This testcase models a good case as we can see it when all TCH + * and SACCH blocks are received */ + .name = "Incomplete TCH/F measurement period (16 measurements, 1 sub-frame)", + .ulm = ulm_tch_f_dtx_with_lost_subs, + .ulm_count = ARRAY_SIZE(ulm_tch_f_dtx_with_lost_subs), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 14, + .rx_qual_full = 7, + .toa256_mean = 10485, + .toa256_max = 16384, + .toa256_min = 0, + .toa256_std_dev = 7864, + }, +}; + +/* This testcase models a good-case with DTX. Some measurements are missing + * because no block was transmitted, all sub measurements are there. */ +static struct bts_ul_meas ulm_tch_f_dtx[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), +}; +static const struct meas_testcase mtc_tch_f_dtx = { + .name = "Incomplete but normal TCH/F measurement period (16 measurements, 3 sub-frames)", + .ulm = ulm_tch_f_dtx, + .ulm_count = ARRAY_SIZE(ulm_tch_f_dtx), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 14, + .rx_qual_full = 7, + .toa256_mean = 10485, + .toa256_max = 16384, + .toa256_min = 0, + .toa256_std_dev = 7864, + }, +}; + +/* This testcase models a good case as we can see it when all TCH + * and SACCH blocks are received */ +static struct bts_ul_meas ulm_tch_h_complete[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; +static const struct meas_testcase mtc_tch_h_complete = { + .name = "Complete TCH/H measurement period (26 measurements, 5 sub-frames)", + .ulm = ulm_tch_h_complete, + .ulm_count = ARRAY_SIZE(ulm_tch_h_complete), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_H, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm_tch_h_dtx_with_lost_subs[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), +}; +static const struct meas_testcase mtc_tch_h_dtx_with_lost_subs = { + .name = "Incomplete TCH/H measurement period (14 measurements, 3 sub-frames)", + .ulm = ulm_tch_h_dtx_with_lost_subs, + .ulm_count = ARRAY_SIZE(ulm_tch_h_dtx_with_lost_subs), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_H, + .res = { + .success = 1, + .rx_lev_full = 12, + .rx_qual_full = 7, + .toa256_mean = 9175, + .toa256_max = 16384, + .toa256_min = 0, + .toa256_std_dev = 8132, + }, +}; + +/* This testcase models a good-case with DTX. Some measurements are missing + * because no block was transmitted, all sub measurements are there. */ +static struct bts_ul_meas ulm_tch_h_dtx[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), +}; +static const struct meas_testcase mtc_tch_h_dtx = { + .name = "Incomplete but normal TCH/F measurement period (16 measurements, 5 sub-frames)", + .ulm = ulm_tch_h_dtx, + .ulm_count = ARRAY_SIZE(ulm_tch_h_dtx), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_H, + .res = { + .success = 1, + .rx_lev_full = 14, + .rx_qual_full = 7, + .toa256_mean = 10485, + .toa256_max = 16384, + .toa256_min = 0, + .toa256_std_dev = 7864, + }, +}; + +/* This testcase assumes that too many measurements were collected. This can + * happen when the measurement calculation for a previous cycle were not + * executed. In this case the older part of the excess data must be discarded. + * the calculation algorithm must make sure that the calculation only takes + * place on the last measurement interval */ +static struct bts_ul_meas ulm_overrun[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + /* All measurements above must be discarded */ + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; +static const struct meas_testcase mtc_overrun = { + .name = "TCH/F measurement period with too much measurement values (overrun)", + .ulm = ulm_overrun, + .ulm_count = ARRAY_SIZE(ulm_overrun), + .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; + +/* Test SDCCH4 with all frames received */ +static struct bts_ul_meas ulm_sdcch4_complete[] = { + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), +}; +static const struct meas_testcase mtc_sdcch4_complete = { + .name = "Complete SDCCH4 measurement period (3 measurements)", + .ulm = ulm_sdcch4_complete, + .ulm_count = ARRAY_SIZE(ulm_sdcch4_complete), + .final_fn = 88, + .ts = 0, + .pchan = GSM_PCHAN_CCCH_SDCCH4, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 0, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; + +/* Test SDCCH8 with all frames received */ +static struct bts_ul_meas ulm_sdcch8_complete[] = { + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), +}; +static const struct meas_testcase mtc_sdcch8_complete = { + .name = "Complete SDCCH8 measurement period (3 measurements)", + .ulm = ulm_sdcch8_complete, + .ulm_count = ARRAY_SIZE(ulm_sdcch8_complete), + .final_fn = 66, + .ts = 0, + .pchan = GSM_PCHAN_SDCCH8_SACCH8C, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 0, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; -- To view, visit https://gerrit.osmocom.org/10476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idd30fc07603ad7d042c1fb416e247c3bf7d35c8b Gerrit-Change-Number: 10476 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 16 00:09:11 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 00:09:11 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b754f8d9c760_14eb60868c8858@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: build on obs-arm-3:7 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 00:25:28 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 00:25:28 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b754fc9759c7_14eb60868c9237b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_9.0/armv7l Package network:osmocom:nightly/rtl-sdr failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: build on obs-arm-1:5 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 00:30:39 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 00:30:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b754fd451050_14eb60868c931b8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: build on obs-arm-1:3 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 01:02:03 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 01:02:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75508cc6174_14eb60868c9872@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: build on obs-arm-4:19 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 01:08:03 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 01:08:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7550bf2fe7c_14eb60868c99693@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: build on obs-arm-1:9 did not create a logfile gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 01:25:46 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 01:25:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75512b88810_14eb60868c103613@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: build on obs-arm-4:23 did not create a logfile gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Aug 16 12:36:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 12:36:02 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add VTY parameter: link stored-msgs-max-length Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10477 Change subject: gbproxy: Add VTY parameter: link stored-msgs-max-length ...................................................................... gbproxy: Add VTY parameter: link stored-msgs-max-length It was discovered in some prod setups that some TLLIs can maintain quite long queues of msgb in case its IMSI is not acquired and the tlli is not pruned due to link-list max-{age,length} being set to 0. As a result, the osmo-gpbroxy steadly increases the list size of maintained TLLIs, and some TLLI was found without IMSI catching already 1211 msgb. Let's allow setting a maxiumum length for the queue storing those msgb in a per TLLI base. If the limit is reached, oldest msgb are removed before adding a new one. Related: SYS#4297 Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 --- M include/osmocom/sgsn/gb_proxy.h M src/gprs/gb_proxy.c M src/gprs/gb_proxy_vty.c 3 files changed, 58 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/77/10477/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 70de3d7..16082fc 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -105,8 +105,12 @@ struct osmo_plmn_id core_plmn; uint8_t* core_apn; size_t core_apn_size; + /* If !0, Max age to consider a struct gbproxy_link_info as stale */ int tlli_max_age; + /* If !0, Max len of gbproxy_peer->list (list of struct gbproxy_link_info) */ int tlli_max_len; + /* If !0, Max len of gbproxy_link_info->stored_msgs (list of msgb) */ + uint32_t stored_msgs_max_len; /* Experimental config */ int patch_ptmsi; @@ -171,6 +175,7 @@ int imsi_acq_pending; struct llist_head stored_msgs; + uint32_t stored_msgs_len; unsigned vu_gen_tx_bss; int is_deregistered; diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index dc3c810..5b2149e 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -344,6 +344,8 @@ tmp_parse_ctx.peer_nsei = msgb_nsei(stored_msg); int len_change = 0; + link_info->stored_msgs_len--; + gprs_gb_parse_bssgp(msgb_bssgph(stored_msg), msgb_bssgp_len(stored_msg), &tmp_parse_ctx); @@ -492,6 +494,24 @@ /* The message cannot be processed since the IMSI is still missing */ + /* If queue is getting too large, drop oldest msgb before adding new one */ + if (peer->cfg->stored_msgs_max_len > 0) { + int exceeded_max_len = link_info->stored_msgs_len + + 1 - peer->cfg->stored_msgs_max_len; + + for (; exceeded_max_len > 0; exceeded_max_len--) { + struct msgb *msgb_drop; + msgb_drop = msgb_dequeue(&link_info->stored_msgs); + link_info->stored_msgs_len--; + LOGP(DLLC, LOGL_INFO, + "NSEI=%d(BSS) Dropping stored msgb from list " + "(!acq imsi, length %d, max_len exceeded)\n", + msgb_nsei(msgb_drop), link_info->stored_msgs_len); + + msgb_free(msgb_drop); + } + } + /* Enqueue unpatched messages */ LOGP(DLLC, LOGL_INFO, "NSEI=%d(BSS) IMSI acquisition in progress, " @@ -501,6 +521,7 @@ stored_msg = bssgp_msgb_copy(msg, "process_bssgp_ul"); msgb_enqueue(&link_info->stored_msgs, stored_msg); + link_info->stored_msgs_len++; if (!link_info->imsi_acq_pending) { LOGP(DLLC, LOGL_INFO, diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c index d7d35fe..dc0b502 100644 --- a/src/gprs/gb_proxy_vty.c +++ b/src/gprs/gb_proxy_vty.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -128,6 +129,9 @@ vty_out(vty, " link-list keep-mode %s%s", get_value_string(keep_modes, g_cfg->keep_link_infos), VTY_NEWLINE); + if (g_cfg->stored_msgs_max_len > 0) + vty_out(vty, " link stored-msgs-max-length %"PRIu32"%s", + g_cfg->stored_msgs_max_len, VTY_NEWLINE); return CMD_SUCCESS; @@ -402,6 +406,7 @@ } #define GBPROXY_LINK_LIST_STR "Set TLLI list parameters\n" +#define GBPROXY_LINK_STR "Set TLLI parameters\n" #define GBPROXY_MAX_AGE_STR "Limit maximum age\n" DEFUN(cfg_gbproxy_link_list_max_age, @@ -464,6 +469,27 @@ return CMD_SUCCESS; } +DEFUN(cfg_gbproxy_link_stored_msgs_max_len, + cfg_gbproxy_link_stored_msgs_max_len_cmd, + "link stored-msgs-max-length <1-99999>", + GBPROXY_LINK_STR GBPROXY_MAX_LEN_STR + "Maximum number of msgb stored in the logical link waiting to acquire its IMSI\n") +{ + g_cfg->stored_msgs_max_len = (uint32_t) atoi(argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(cfg_gbproxy_link_no_stored_msgs_max_len, + cfg_gbproxy_link_no_stored_msgs_max_len_cmd, + "no link stored-msgs-max-length", + NO_STR GBPROXY_LINK_STR GBPROXY_MAX_LEN_STR) +{ + g_cfg->stored_msgs_max_len = 0; + + return CMD_SUCCESS; +} + DEFUN(show_gbproxy, show_gbproxy_cmd, "show gbproxy [stats]", SHOW_STR "Display information about the Gb proxy\n" "Show statistics\n") @@ -502,10 +528,6 @@ llist_for_each_entry(link_info, &state->logical_links, list) { time_t age = now - link_info->timestamp; - int stored_msgs = 0; - struct llist_head *iter; - llist_for_each(iter, &link_info->stored_msgs) - stored_msgs++; if (link_info->imsi > 0) { snprintf(mi_buf, sizeof(mi_buf), "(invalid)"); @@ -518,8 +540,10 @@ vty_out(vty, " TLLI %08x, IMSI %s, AGE %d", link_info->tlli.current, mi_buf, (int)age); - if (stored_msgs) - vty_out(vty, ", STORED %d", stored_msgs); + if (link_info->stored_msgs_len) + vty_out(vty, ", STORED %"PRIu32"/%"PRIu32, + link_info->stored_msgs_len, + g_cfg->stored_msgs_max_len); if (g_cfg->route_to_sgsn2) vty_out(vty, ", SGSN NSEI %d", @@ -825,6 +849,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_keep_mode_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_stored_msgs_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_core_mcc_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_core_mnc_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_match_imsi_cmd); @@ -834,6 +859,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_no_acquire_imsi_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_len_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_no_stored_msgs_max_len_cmd); /* broken or deprecated to allow an upgrade path */ install_element(GBPROXY_NODE, &cfg_gbproxy_broken_apn_match_cmd); -- To view, visit https://gerrit.osmocom.org/10477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 Gerrit-Change-Number: 10477 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 13:09:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 13:09:23 +0000 Subject: Change in openbsc[master]: vty: Fix typo writing bts-jitter-buffer-delay-{min, max} Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10478 Change subject: vty: Fix typo writing bts-jitter-buffer-delay-{min,max} ...................................................................... vty: Fix typo writing bts-jitter-buffer-delay-{min,max} Change-Id: I83948ce626b924802d1963411a3f40c5fed24355 --- M openbsc/src/libmgcp/mgcp_vty.c M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/78/10478/1 diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index 6d1a7ac..d5908f3 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -168,9 +168,9 @@ if (g_cfg->bts_use_jibuf) vty_out(vty, " bts-jitter-buffer%s", VTY_NEWLINE); if (g_cfg->bts_jitter_delay_min) - vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); if (g_cfg->bts_jitter_delay_max) - vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 15db664..bc1050d 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -113,9 +113,9 @@ if (bsc->bts_use_jibuf_override) vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE); if (bsc->bts_jitter_delay_min_override) - vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE); if (bsc->bts_jitter_delay_max_override) - vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE); } static int config_write_bsc(struct vty *vty) -- To view, visit https://gerrit.osmocom.org/10478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I83948ce626b924802d1963411a3f40c5fed24355 Gerrit-Change-Number: 10478 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 13:10:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 13:10:58 +0000 Subject: Change in osmo-mgw[master]: vty: Fix typo writing bts-jitter-buffer-delay-{min, max} Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10479 Change subject: vty: Fix typo writing bts-jitter-buffer-delay-{min,max} ...................................................................... vty: Fix typo writing bts-jitter-buffer-delay-{min,max} Change-Id: I15ec1bd9e8d2241d29ef64cefe7ad4879ccdf898 --- M src/libosmo-legacy-mgcp/mgcp_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/79/10479/1 diff --git a/src/libosmo-legacy-mgcp/mgcp_vty.c b/src/libosmo-legacy-mgcp/mgcp_vty.c index be884cb..420333d 100644 --- a/src/libosmo-legacy-mgcp/mgcp_vty.c +++ b/src/libosmo-legacy-mgcp/mgcp_vty.c @@ -168,9 +168,9 @@ if (g_cfg->bts_use_jibuf) vty_out(vty, " bts-jitter-buffer%s", VTY_NEWLINE); if (g_cfg->bts_jitter_delay_min) - vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); if (g_cfg->bts_jitter_delay_max) - vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I15ec1bd9e8d2241d29ef64cefe7ad4879ccdf898 Gerrit-Change-Number: 10479 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 13:16:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 16 Aug 2018 13:16:24 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add VTY parameter: link stored-msgs-max-length In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10477 ) Change subject: gbproxy: Add VTY parameter: link stored-msgs-max-length ...................................................................... Patch Set 1: Code-Review+1 Very nice! I don't think there is any risk in applying these changes. We need some way to limit boundless growth of this list and the protocols must be equipped to deal with dropped messages anyway. -- To view, visit https://gerrit.osmocom.org/10477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 Gerrit-Change-Number: 10477 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 16 Aug 2018 13:16:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 14:17:43 2018 From: gerrit-no-reply at lists.osmocom.org (kamilner) Date: Thu, 16 Aug 2018 14:17:43 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: kamilner has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: Verified-1 Tested this on a lab system. Previously SDP Connection information IP address in INVITE was being reverse. This fixes it nicely. Confirmed to be working -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 14:17:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 14:20:31 2018 From: gerrit-no-reply at lists.osmocom.org (kamilner) Date: Thu, 16 Aug 2018 14:20:31 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: kamilner has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: Verified+1 Tested this on a lab system. Previously SDP Connection information IP address in INVITE was being reverse. This fixes it nicely. Confirmed to be working -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 14:20:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 14:21:13 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?Tobias_M=C3=A4del?=) Date: Thu, 16 Aug 2018 14:21:13 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Tobias M?del has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: Hello kamilner, thanks for testing! Could you vote +1 instead of -1? Does audio work for you yet? I wasn't able to get a codec negotiated yet. Thanks, Tobias -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 14:21:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 14:33:41 2018 From: gerrit-no-reply at lists.osmocom.org (kamilner) Date: Thu, 16 Aug 2018 14:33:41 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: kamilner has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: I wasn't able to get audio working yet. SDP negotiation seems to work: I get GSM/8000 in the INVITE and in the OK response from my Asterisk system. The first RTP packet from the MGW seems to be corrupted. It has a single byte payload and wireshark reports "Unknown RTP version". -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 14:33:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 14:37:20 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?Tobias_M=C3=A4del?=) Date: Thu, 16 Aug 2018 14:37:20 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Tobias M?del has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: OK, that's the same behaviour I encountered. Harald Welte mentioned in the IRC that the first RTP packet is just a NAT Keep-Alive packet. It can probably be ignored. I think there's something else happening with the sockets. I see UDP RDP traffic from my asterisk on the lo interface, which the kernel is replying to with an ICMP unreachable message, as if the osmo-mgw isn't even listening. Do you have another method of contact like IRC or mail? We probably shouldn't spam this thread :) -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 14:37:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 14:40:30 2018 From: gerrit-no-reply at lists.osmocom.org (kamilner) Date: Thu, 16 Aug 2018 14:40:30 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: kamilner has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: I'm currently on the #osmocom channel on IRC, username Majk_ -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del Gerrit-Reviewer: Tobias M?del Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 14:40:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 14:44:10 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 16 Aug 2018 14:44:10 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10452/2/src/sdp.c File src/sdp.c: https://gerrit.osmocom.org/#/c/10452/2/src/sdp.c at 168 PS2, Line 168: struct in_addr net = { .s_addr = other->ip }; If you do this, you will break osmo-sip-connector for openBSC/osmo-nitb (legacy systems) -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del (manawyrm) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Tobias M?del (manawyrm) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 14:44:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 15:03:47 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?Tobias_M=C3=A4del_=28manawyrm=29?=) Date: Thu, 16 Aug 2018 15:03:47 +0000 Subject: Change in osmo-sip-connector[master]: sdp: remove htonl() from in_addr In-Reply-To: References: Message-ID: Tobias M?del (manawyrm) has posted comments on this change. ( https://gerrit.osmocom.org/10452 ) Change subject: sdp: remove htonl() from in_addr ...................................................................... Patch Set 2: Code-Review-1 > Patch Set 2: Code-Review-1 > > (1 comment) Yep. We discussed this in IRC and I'm now also against merging this. I'll fix this properly and submit a new patch. -- To view, visit https://gerrit.osmocom.org/10452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2bebfb905afc91afc01770df8532b749f494806 Gerrit-Change-Number: 10452 Gerrit-PatchSet: 2 Gerrit-Owner: Tobias M?del (manawyrm) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Tobias M?del (manawyrm) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: kamilner Gerrit-Reviewer: lynxis lazus Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 16 Aug 2018 15:03:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Aug 16 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 16 Aug 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#217?= In-Reply-To: <1741121523.223.1534345805949.JavaMail.jenkins@jenkins.osmocom.org> References: <1741121523.223.1534345805949.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <359752082.8.1534432207776.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Aug 16 16:14:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 16 Aug 2018 16:14:26 +0000 Subject: Change in osmo-bts[master]: cosmetic: separate measurement testcase definitions Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10480 Change subject: cosmetic: separate measurement testcase definitions ...................................................................... cosmetic: separate measurement testcase definitions the testcase definitions in meas_test.c that define different test situations for uplink measurement are quite large. Lets have them in a separate file so that the code meas_test.c is easier to maintain. - Move all mtc* and ulm* structs as well as the struct definitions to meas_testcase.h. Change-Id: I90139ec535056d2cea6de10e77f435d807ce496e Related: OS#2987 --- M tests/meas/Makefile.am M tests/meas/meas_test.c A tests/meas/meas_testcases.h 3 files changed, 153 insertions(+), 156 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/10480/1 diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index 3c83e52..d8fa118 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = meas_test -noinst_HEADERS = sysmobts_fr_samples.h +noinst_HEADERS = sysmobts_fr_samples.h meas_testcases.h EXTRA_DIST = meas_test.ok meas_test_SOURCES = meas_test.c diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index e889345..2ba44d3 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -21,6 +21,7 @@ }; #include "sysmobts_fr_samples.h" +#include "meas_testcases.h" void test_fn_sample(struct fn_sample *s, unsigned int len, uint8_t pchan, uint8_t tsmap) { @@ -63,161 +64,6 @@ OSMO_ASSERT(tsmap_result == tsmap); } -#define ULM(ber, ta, neg_rssi) \ - { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = 0, .inv_rssi = (neg_rssi) } - -struct meas_testcase { - const char *name; - /* input data */ - const struct bts_ul_meas *ulm; - unsigned int ulm_count; - uint32_t final_fn; - /* results */ - struct { - int success; - uint8_t rx_lev_full; - uint8_t rx_qual_full; - int16_t toa256_mean; - int16_t toa256_min; - int16_t toa256_max; - uint16_t toa256_std_dev; - } res; -}; - -static struct bts_ul_meas ulm1[] = { - ULM(0, 0, 90), - ULM(0, 256, 90), - ULM(0, -256, 90), -}; -static const struct meas_testcase mtc1 = { - .name = "TOA256 Min-Max negative/positive", - .ulm = ulm1, - .ulm_count = ARRAY_SIZE(ulm1), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 256, - .toa256_min = -256, - .toa256_std_dev = 209, - }, -}; - - -static struct bts_ul_meas ulm2[] = { - ULM(0, 256, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 256, 90), -}; -static const struct meas_testcase mtc2 = { - .name = "TOA256 small jitter around 256", - .ulm = ulm2, - .ulm_count = ARRAY_SIZE(ulm2), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 256, - .toa256_max = 258, - .toa256_min = 254, - .toa256_std_dev = 1, - }, -}; - -static struct bts_ul_meas ulm3[] = { - ULM(0, 0, 90), - ULM(0, 0, 80), - ULM(0, 0, 80), - ULM(0, 0, 100), - ULM(0, 0, 100), -}; -static const struct meas_testcase mtc3 = { - .name = "RxLEv averaging", - .ulm = ulm3, - .ulm_count = ARRAY_SIZE(ulm3), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 0, - .toa256_min = 0, - .toa256_std_dev = 0, - }, -}; - -static struct bts_ul_meas ulm4[] = { -}; -static const struct meas_testcase mtc4 = { - .name = "Empty measurements", - .ulm = ulm4, - .ulm_count = ARRAY_SIZE(ulm4), - .final_fn = 25, - .res = { - .success = 0, - .rx_lev_full = 0, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 0, - .toa256_min = 0, - .toa256_std_dev = 0, - }, -}; - -static struct bts_ul_meas ulm5[] = { - /* one 104 multiframe can at max contain 26 blocks (TCH/F), - * each of which can at maximum be 64 bits in advance (TA range) */ - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), -}; -static const struct meas_testcase mtc5 = { - .name = "TOA256 26 blocks with max TOA256", - .ulm = ulm5, - .ulm_count = ARRAY_SIZE(ulm5), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 64*256, - .toa256_max = 64*256, - .toa256_min = 64*256, - .toa256_std_dev = 0, - }, -}; - - static void reset_lchan_meas(struct gsm_lchan *lchan) { lchan->state = LCHAN_S_ACTIVE; diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h new file mode 100644 index 0000000..ff74a20 --- /dev/null +++ b/tests/meas/meas_testcases.h @@ -0,0 +1,151 @@ +#define ULM(ber, ta, neg_rssi) \ + { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = 0, .inv_rssi = (neg_rssi) } + +struct meas_testcase { + const char *name; + /* input data */ + const struct bts_ul_meas *ulm; + unsigned int ulm_count; + uint32_t final_fn; + /* results */ + struct { + int success; + uint8_t rx_lev_full; + uint8_t rx_qual_full; + int16_t toa256_mean; + int16_t toa256_min; + int16_t toa256_max; + uint16_t toa256_std_dev; + } res; +}; + +static struct bts_ul_meas ulm1[] = { + ULM(0, 0, 90), + ULM(0, 256, 90), + ULM(0, -256, 90), +}; +static const struct meas_testcase mtc1 = { + .name = "TOA256 Min-Max negative/positive", + .ulm = ulm1, + .ulm_count = ARRAY_SIZE(ulm1), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 256, + .toa256_min = -256, + .toa256_std_dev = 209, + }, +}; + +static struct bts_ul_meas ulm2[] = { + ULM(0, 256, 90), + ULM(0, 258, 90), + ULM(0, 254, 90), + ULM(0, 258, 90), + ULM(0, 254, 90), + ULM(0, 256, 90), +}; +static const struct meas_testcase mtc2 = { + .name = "TOA256 small jitter around 256", + .ulm = ulm2, + .ulm_count = ARRAY_SIZE(ulm2), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 256, + .toa256_max = 258, + .toa256_min = 254, + .toa256_std_dev = 1, + }, +}; + +static struct bts_ul_meas ulm3[] = { + ULM(0, 0, 90), + ULM(0, 0, 80), + ULM(0, 0, 80), + ULM(0, 0, 100), + ULM(0, 0, 100), +}; +static const struct meas_testcase mtc3 = { + .name = "RxLEv averaging", + .ulm = ulm3, + .ulm_count = ARRAY_SIZE(ulm3), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 0, + .toa256_min = 0, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm4[] = {}; +static const struct meas_testcase mtc4 = { + .name = "Empty measurements", + .ulm = ulm4, + .ulm_count = ARRAY_SIZE(ulm4), + .final_fn = 25, + .res = { + .success = 0, + .rx_lev_full = 0, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 0, + .toa256_min = 0, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm5[] = { + /* one 104 multiframe can at max contain 26 blocks (TCH/F), + * each of which can at maximum be 64 bits in advance (TA range) */ + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), +}; +static const struct meas_testcase mtc5 = { + .name = "TOA256 26 blocks with max TOA256", + .ulm = ulm5, + .ulm_count = ARRAY_SIZE(ulm5), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; -- To view, visit https://gerrit.osmocom.org/10480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I90139ec535056d2cea6de10e77f435d807ce496e Gerrit-Change-Number: 10480 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 17:08:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 17:08:13 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10481 Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... signal: Introduce API osmo_signal_talloc_ctx_init Otherwise applications need to use "extern void* tall_sigh_ctx" and set it manually (that symbol is not exported in any header file) or end up allocating struct signal_handler into the NULL talloc ctx. API created in a similar way as already existing msgb_talloc_ctx_init(), but without the pool_size because it's not considered necessary in this case. Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 --- M include/osmocom/core/signal.h M src/signal.c 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/10481/1 diff --git a/include/osmocom/core/signal.h b/include/osmocom/core/signal.h index ae78f15..449b976 100644 --- a/include/osmocom/core/signal.h +++ b/include/osmocom/core/signal.h @@ -34,6 +34,7 @@ /* Management */ +void *osmo_signal_talloc_ctx_init(void *root_ctx); int osmo_signal_register_handler(unsigned int subsys, osmo_signal_cbfn *cbfn, void *data); void osmo_signal_unregister_handler(unsigned int subsys, osmo_signal_cbfn *cbfn, void *data); diff --git a/src/signal.c b/src/signal.c index 745d7c3..1212afe 100644 --- a/src/signal.c +++ b/src/signal.c @@ -46,6 +46,16 @@ void *data; }; +/*! Initialize a signal_handler talloc context for \ref osmo_signal_register_handler. + * Create a talloc context called "osmo_signal". + * \param[in] root_ctx talloc context used as parent for the new "osmo_signal" ctx. + * \returns the new osmo_signal talloc context, e.g. for reporting + */ +void *osmo_signal_talloc_ctx_init(void *root_ctx) { + tall_sigh_ctx = talloc_size(root_ctx, 0); + talloc_set_name_const(tall_sigh_ctx, "osmo_signal"); + return tall_sigh_ctx; +} /*! Register a new signal handler * \param[in] subsys Subsystem number -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 17:09:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 17:09:52 +0000 Subject: Change in osmo-msc[master]: msc: Set talloc ctx for osmo_signal structures Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10482 Change subject: msc: Set talloc ctx for osmo_signal structures ...................................................................... msc: Set talloc ctx for osmo_signal structures Otherwise they end up in the NULL ctx. Depends: libosmocore Change-Id Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Change-Id: I5d5b456eb85fbdb0ca2140c56ebf3d207b4a0bba --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/10482/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 1a10278..f87a95e 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -530,6 +530,7 @@ msc_vty_info.tall_ctx = tall_msc_ctx; msgb_talloc_ctx_init(tall_msc_ctx, 0); + osmo_signal_talloc_ctx_init(tall_msc_ctx); tall_gsms_ctx = talloc_named_const(tall_msc_ctx, 0, "sms"); tall_call_ctx = talloc_named_const(tall_msc_ctx, 0, "gsm_call"); tall_trans_ctx = talloc_named_const(tall_msc_ctx, 0, "transaction"); -- To view, visit https://gerrit.osmocom.org/10482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d5b456eb85fbdb0ca2140c56ebf3d207b4a0bba Gerrit-Change-Number: 10482 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 17:15:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 17:15:44 +0000 Subject: Change in osmo-bsc[master]: bsc: Use libosmocore API to track osmo_signal structs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10483 Change subject: bsc: Use libosmocore API to track osmo_signal structs ...................................................................... bsc: Use libosmocore API to track osmo_signal structs libosmocore recently had the new API introduced for this purpose. Depends: libosmocore Change-Id Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Change-Id: Id07260635327617f8da5050af1e906891a89c530 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/10483/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 37e8665..8ff0e8a 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -783,7 +783,6 @@ extern void *tall_paging_ctx; extern void *tall_fle_ctx; -extern void *tall_sigh_ctx; extern void *tall_tqe_ctx; extern void *tall_ctr_ctx; @@ -795,12 +794,12 @@ tall_bsc_ctx = talloc_named_const(NULL, 1, "osmo-bsc"); msgb_talloc_ctx_init(tall_bsc_ctx, 0); + osmo_signal_talloc_ctx_init(tall_bsc_ctx); osmo_xua_msg_tall_ctx_init(tall_bsc_ctx); vty_info.tall_ctx = tall_bsc_ctx; tall_paging_ctx = talloc_named_const(tall_bsc_ctx, 0, "paging_request"); tall_fle_ctx = talloc_named_const(tall_bsc_ctx, 0, "bs11_file_list_entry"); - tall_sigh_ctx = talloc_named_const(tall_bsc_ctx, 0, "signal_handler"); tall_tqe_ctx = talloc_named_const(tall_bsc_ctx, 0, "subch_txq_entry"); tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter"); -- To view, visit https://gerrit.osmocom.org/10483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id07260635327617f8da5050af1e906891a89c530 Gerrit-Change-Number: 10483 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 18:17:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 16 Aug 2018 18:17:34 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10481 ) Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/10481/1/src/signal.c File src/signal.c: https://gerrit.osmocom.org/#/c/10481/1/src/signal.c at 39 PS1, Line 39: void *tall_sigh_ctx; Oh, wow, it is not even being initialized to NULL. Moreover, it is not static, so it's exposed... https://gerrit.osmocom.org/#/c/10481/1/src/signal.c at 55 PS1, Line 55: tall_sigh_ctx = talloc_size(root_ctx, 0); : talloc_set_name_const(tall_sigh_ctx, "osmo_signal"); Feel free to use talloc_init() here. -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 16 Aug 2018 18:17:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 18:52:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 18:52:26 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Fix build if required kernel modules are built-in in kernel Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10484 Change subject: osmo-ggsn: Fix build if required kernel modules are built-in in kernel ...................................................................... osmo-ggsn: Fix build if required kernel modules are built-in in kernel If kernel being built has some of the required modules built-in, package for that module is not generated, and so dependencies wil lfail at install time during image generation. Change-Id: I2e0d1fbcffc5f72980878ac76072d9de5fc0c690 --- M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/84/10484/1 diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 58f00ec..8c948cc 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -15,7 +15,8 @@ DEPENDS = "libosmocore" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" -RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade kernel-module-tun" +RDEPENDS_${PN} += "iptables" +RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" inherit autotools update-rc.d pkgconfig systemd -- To view, visit https://gerrit.osmocom.org/10484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I2e0d1fbcffc5f72980878ac76072d9de5fc0c690 Gerrit-Change-Number: 10484 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 18:59:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 18:59:56 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10481 ) Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/10481/1/src/signal.c File src/signal.c: https://gerrit.osmocom.org/#/c/10481/1/src/signal.c at 39 PS1, Line 39: void *tall_sigh_ctx; > Oh, wow, it is not even being initialized to NULL. [?] It's implicitly initialized to NULL. All global variables are since they are allocated in a zeroed page. I think it's exposed on purpose, because osmo-bsc and osmocom-bb were using it directly... a patch for osmocom-bb is still needed to move to the new API. https://gerrit.osmocom.org/#/c/10481/1/src/signal.c at 55 PS1, Line 55: tall_sigh_ctx = talloc_size(root_ctx, 0); : talloc_set_name_const(tall_sigh_ctx, "osmo_signal"); > Feel free to use talloc_init() here. ACK -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 16 Aug 2018 18:59:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 19:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 19:03:59 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10481 to look at the new patch set (#2). Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... signal: Introduce API osmo_signal_talloc_ctx_init Otherwise applications need to use "extern void* tall_sigh_ctx" and set it manually (that symbol is not exported in any header file) or end up allocating struct signal_handler into the NULL talloc ctx. API created in a similar way as already existing msgb_talloc_ctx_init(), but without the pool_size because it's not considered necessary in this case. Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 --- M include/osmocom/core/signal.h M src/signal.c 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/10481/2 -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 19:04:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 16 Aug 2018 19:04:44 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10481 ) Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... Patch Set 2: I finally used talloc_named_const() because talloc_init() calls insead talloc_named() which we don't need in this case. -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 16 Aug 2018 19:04:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 16 19:25:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 16 Aug 2018 19:25:37 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10481 ) Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... Patch Set 2: Code-Review+1 > I finally used talloc_named_const() because talloc_init() calls > insead talloc_named() which we don't need in this case. Oh, just had a look at its source code... There was nothing stated in the man page about the fact that it calls talloc_enable_null_tracking()... I need to stop using it. -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 16 Aug 2018 19:25:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu Aug 16 20:03:46 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:03:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-python-tests in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75d8ad586a0_14eb60868c315680@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log: build on obs-arm-4:12 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:14:55 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:14:55 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75db424c7f2_14eb60868c316287@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/armv7l Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: build on obs-arm-4:13 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:19:16 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:19:16 +0000 Subject: Build failure of network:osmocom:nightly/rtl-sdr in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75dc4db5ab5_14eb60868c316692@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/rtl-sdr/Debian_9.0/armv7l Package network:osmocom:nightly/rtl-sdr failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly rtl-sdr Last lines of build log: build on obs-arm-1:2 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:21:50 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:21:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75dce6a3531_14eb60868c3171d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: build on obs-arm-1:11 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:26:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:26:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75de30eb766_14eb60868c317648@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: build on obs-arm-4:32 did not create a logfile gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:28:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:28:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75dea8767c5_14eb60868c3180b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: build on obs-arm-4:9 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:33:16 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:33:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75df954547b_14eb60868c3182ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: build on obs-arm-1:15 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:34:25 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:34:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75dfd5b1537_14eb60868c318493@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: build on obs-arm-1:1 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu Aug 16 20:53:33 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 16 Aug 2018 20:53:33 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b75e4675c2f0_14eb60868c320685@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/armv7l Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: build on obs-arm-1:3 did not create a logfile gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri Aug 17 02:16:13 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Aug 2018 02:16:13 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b763005f2730_14eb60868c3625f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/armv7l Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: build on obs-arm-1:18 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:05:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:05:12 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10481 ) Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 17 Aug 2018 07:05:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:05:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:05:13 +0000 Subject: Change in libosmocore[master]: signal: Introduce API osmo_signal_talloc_ctx_init In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10481 ) Change subject: signal: Introduce API osmo_signal_talloc_ctx_init ...................................................................... signal: Introduce API osmo_signal_talloc_ctx_init Otherwise applications need to use "extern void* tall_sigh_ctx" and set it manually (that symbol is not exported in any header file) or end up allocating struct signal_handler into the NULL talloc ctx. API created in a similar way as already existing msgb_talloc_ctx_init(), but without the pool_size because it's not considered necessary in this case. Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 --- M include/osmocom/core/signal.h M src/signal.c 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/signal.h b/include/osmocom/core/signal.h index ae78f15..449b976 100644 --- a/include/osmocom/core/signal.h +++ b/include/osmocom/core/signal.h @@ -34,6 +34,7 @@ /* Management */ +void *osmo_signal_talloc_ctx_init(void *root_ctx); int osmo_signal_register_handler(unsigned int subsys, osmo_signal_cbfn *cbfn, void *data); void osmo_signal_unregister_handler(unsigned int subsys, osmo_signal_cbfn *cbfn, void *data); diff --git a/src/signal.c b/src/signal.c index 745d7c3..188876b 100644 --- a/src/signal.c +++ b/src/signal.c @@ -46,6 +46,15 @@ void *data; }; +/*! Initialize a signal_handler talloc context for \ref osmo_signal_register_handler. + * Create a talloc context called "osmo_signal". + * \param[in] root_ctx talloc context used as parent for the new "osmo_signal" ctx. + * \returns the new osmo_signal talloc context, e.g. for reporting + */ +void *osmo_signal_talloc_ctx_init(void *root_ctx) { + tall_sigh_ctx = talloc_named_const(tall_sigh_ctx, 0, "osmo_signal"); + return tall_sigh_ctx; +} /*! Register a new signal handler * \param[in] subsys Subsystem number -- To view, visit https://gerrit.osmocom.org/10481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Gerrit-Change-Number: 10481 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:05:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:05:39 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Fix build if required kernel modules are built-in in kernel In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10484 ) Change subject: osmo-ggsn: Fix build if required kernel modules are built-in in kernel ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I2e0d1fbcffc5f72980878ac76072d9de5fc0c690 Gerrit-Change-Number: 10484 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 07:05:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:06:02 +0000 Subject: Change in osmo-bsc[master]: bsc: Use libosmocore API to track osmo_signal structs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10483 ) Change subject: bsc: Use libosmocore API to track osmo_signal structs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id07260635327617f8da5050af1e906891a89c530 Gerrit-Change-Number: 10483 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 07:06:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:06:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:06:32 +0000 Subject: Change in osmo-msc[master]: msc: Set talloc ctx for osmo_signal structures In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10482 ) Change subject: msc: Set talloc ctx for osmo_signal structures ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d5b456eb85fbdb0ca2140c56ebf3d207b4a0bba Gerrit-Change-Number: 10482 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 07:06:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:07:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:07:05 +0000 Subject: Change in osmo-bts[master]: cosmetic: separate measurement testcase definitions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10480 ) Change subject: cosmetic: separate measurement testcase definitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I90139ec535056d2cea6de10e77f435d807ce496e Gerrit-Change-Number: 10480 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 07:07:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:07:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:07:08 +0000 Subject: Change in osmo-bts[master]: cosmetic: separate measurement testcase definitions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10480 ) Change subject: cosmetic: separate measurement testcase definitions ...................................................................... cosmetic: separate measurement testcase definitions the testcase definitions in meas_test.c that define different test situations for uplink measurement are quite large. Lets have them in a separate file so that the code meas_test.c is easier to maintain. - Move all mtc* and ulm* structs as well as the struct definitions to meas_testcase.h. Change-Id: I90139ec535056d2cea6de10e77f435d807ce496e Related: OS#2987 --- M tests/meas/Makefile.am M tests/meas/meas_test.c A tests/meas/meas_testcases.h 3 files changed, 153 insertions(+), 156 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index 3c83e52..d8fa118 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = meas_test -noinst_HEADERS = sysmobts_fr_samples.h +noinst_HEADERS = sysmobts_fr_samples.h meas_testcases.h EXTRA_DIST = meas_test.ok meas_test_SOURCES = meas_test.c diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index e889345..2ba44d3 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -21,6 +21,7 @@ }; #include "sysmobts_fr_samples.h" +#include "meas_testcases.h" void test_fn_sample(struct fn_sample *s, unsigned int len, uint8_t pchan, uint8_t tsmap) { @@ -63,161 +64,6 @@ OSMO_ASSERT(tsmap_result == tsmap); } -#define ULM(ber, ta, neg_rssi) \ - { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = 0, .inv_rssi = (neg_rssi) } - -struct meas_testcase { - const char *name; - /* input data */ - const struct bts_ul_meas *ulm; - unsigned int ulm_count; - uint32_t final_fn; - /* results */ - struct { - int success; - uint8_t rx_lev_full; - uint8_t rx_qual_full; - int16_t toa256_mean; - int16_t toa256_min; - int16_t toa256_max; - uint16_t toa256_std_dev; - } res; -}; - -static struct bts_ul_meas ulm1[] = { - ULM(0, 0, 90), - ULM(0, 256, 90), - ULM(0, -256, 90), -}; -static const struct meas_testcase mtc1 = { - .name = "TOA256 Min-Max negative/positive", - .ulm = ulm1, - .ulm_count = ARRAY_SIZE(ulm1), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 256, - .toa256_min = -256, - .toa256_std_dev = 209, - }, -}; - - -static struct bts_ul_meas ulm2[] = { - ULM(0, 256, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 256, 90), -}; -static const struct meas_testcase mtc2 = { - .name = "TOA256 small jitter around 256", - .ulm = ulm2, - .ulm_count = ARRAY_SIZE(ulm2), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 256, - .toa256_max = 258, - .toa256_min = 254, - .toa256_std_dev = 1, - }, -}; - -static struct bts_ul_meas ulm3[] = { - ULM(0, 0, 90), - ULM(0, 0, 80), - ULM(0, 0, 80), - ULM(0, 0, 100), - ULM(0, 0, 100), -}; -static const struct meas_testcase mtc3 = { - .name = "RxLEv averaging", - .ulm = ulm3, - .ulm_count = ARRAY_SIZE(ulm3), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 0, - .toa256_min = 0, - .toa256_std_dev = 0, - }, -}; - -static struct bts_ul_meas ulm4[] = { -}; -static const struct meas_testcase mtc4 = { - .name = "Empty measurements", - .ulm = ulm4, - .ulm_count = ARRAY_SIZE(ulm4), - .final_fn = 25, - .res = { - .success = 0, - .rx_lev_full = 0, - .rx_qual_full = 0, - .toa256_mean = 0, - .toa256_max = 0, - .toa256_min = 0, - .toa256_std_dev = 0, - }, -}; - -static struct bts_ul_meas ulm5[] = { - /* one 104 multiframe can at max contain 26 blocks (TCH/F), - * each of which can at maximum be 64 bits in advance (TA range) */ - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), -}; -static const struct meas_testcase mtc5 = { - .name = "TOA256 26 blocks with max TOA256", - .ulm = ulm5, - .ulm_count = ARRAY_SIZE(ulm5), - .final_fn = 25, - .res = { - .success = 1, - .rx_lev_full = 110-90, - .rx_qual_full = 0, - .toa256_mean = 64*256, - .toa256_max = 64*256, - .toa256_min = 64*256, - .toa256_std_dev = 0, - }, -}; - - static void reset_lchan_meas(struct gsm_lchan *lchan) { lchan->state = LCHAN_S_ACTIVE; diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h new file mode 100644 index 0000000..ff74a20 --- /dev/null +++ b/tests/meas/meas_testcases.h @@ -0,0 +1,151 @@ +#define ULM(ber, ta, neg_rssi) \ + { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = 0, .inv_rssi = (neg_rssi) } + +struct meas_testcase { + const char *name; + /* input data */ + const struct bts_ul_meas *ulm; + unsigned int ulm_count; + uint32_t final_fn; + /* results */ + struct { + int success; + uint8_t rx_lev_full; + uint8_t rx_qual_full; + int16_t toa256_mean; + int16_t toa256_min; + int16_t toa256_max; + uint16_t toa256_std_dev; + } res; +}; + +static struct bts_ul_meas ulm1[] = { + ULM(0, 0, 90), + ULM(0, 256, 90), + ULM(0, -256, 90), +}; +static const struct meas_testcase mtc1 = { + .name = "TOA256 Min-Max negative/positive", + .ulm = ulm1, + .ulm_count = ARRAY_SIZE(ulm1), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 256, + .toa256_min = -256, + .toa256_std_dev = 209, + }, +}; + +static struct bts_ul_meas ulm2[] = { + ULM(0, 256, 90), + ULM(0, 258, 90), + ULM(0, 254, 90), + ULM(0, 258, 90), + ULM(0, 254, 90), + ULM(0, 256, 90), +}; +static const struct meas_testcase mtc2 = { + .name = "TOA256 small jitter around 256", + .ulm = ulm2, + .ulm_count = ARRAY_SIZE(ulm2), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 256, + .toa256_max = 258, + .toa256_min = 254, + .toa256_std_dev = 1, + }, +}; + +static struct bts_ul_meas ulm3[] = { + ULM(0, 0, 90), + ULM(0, 0, 80), + ULM(0, 0, 80), + ULM(0, 0, 100), + ULM(0, 0, 100), +}; +static const struct meas_testcase mtc3 = { + .name = "RxLEv averaging", + .ulm = ulm3, + .ulm_count = ARRAY_SIZE(ulm3), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 0, + .toa256_min = 0, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm4[] = {}; +static const struct meas_testcase mtc4 = { + .name = "Empty measurements", + .ulm = ulm4, + .ulm_count = ARRAY_SIZE(ulm4), + .final_fn = 25, + .res = { + .success = 0, + .rx_lev_full = 0, + .rx_qual_full = 0, + .toa256_mean = 0, + .toa256_max = 0, + .toa256_min = 0, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm5[] = { + /* one 104 multiframe can at max contain 26 blocks (TCH/F), + * each of which can at maximum be 64 bits in advance (TA range) */ + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), + ULM(0, 64*256, 90), +}; +static const struct meas_testcase mtc5 = { + .name = "TOA256 26 blocks with max TOA256", + .ulm = ulm5, + .ulm_count = ARRAY_SIZE(ulm5), + .final_fn = 25, + .res = { + .success = 1, + .rx_lev_full = 110-90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; -- To view, visit https://gerrit.osmocom.org/10480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I90139ec535056d2cea6de10e77f435d807ce496e Gerrit-Change-Number: 10480 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:09:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:09:23 +0000 Subject: Change in openbsc[master]: vty: Fix typo writing bts-jitter-buffer-delay-{min, max} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10478 ) Change subject: vty: Fix typo writing bts-jitter-buffer-delay-{min,max} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I83948ce626b924802d1963411a3f40c5fed24355 Gerrit-Change-Number: 10478 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 07:09:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:09:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:09:24 +0000 Subject: Change in openbsc[master]: vty: Fix typo writing bts-jitter-buffer-delay-{min, max} In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10478 ) Change subject: vty: Fix typo writing bts-jitter-buffer-delay-{min,max} ...................................................................... vty: Fix typo writing bts-jitter-buffer-delay-{min,max} Change-Id: I83948ce626b924802d1963411a3f40c5fed24355 --- M openbsc/src/libmgcp/mgcp_vty.c M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index 6d1a7ac..d5908f3 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -168,9 +168,9 @@ if (g_cfg->bts_use_jibuf) vty_out(vty, " bts-jitter-buffer%s", VTY_NEWLINE); if (g_cfg->bts_jitter_delay_min) - vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); if (g_cfg->bts_jitter_delay_max) - vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 15db664..bc1050d 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -113,9 +113,9 @@ if (bsc->bts_use_jibuf_override) vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE); if (bsc->bts_jitter_delay_min_override) - vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE); if (bsc->bts_jitter_delay_max_override) - vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE); } static int config_write_bsc(struct vty *vty) -- To view, visit https://gerrit.osmocom.org/10478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I83948ce626b924802d1963411a3f40c5fed24355 Gerrit-Change-Number: 10478 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:09:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:09:39 +0000 Subject: Change in osmo-mgw[master]: vty: Fix typo writing bts-jitter-buffer-delay-{min, max} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10479 ) Change subject: vty: Fix typo writing bts-jitter-buffer-delay-{min,max} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15ec1bd9e8d2241d29ef64cefe7ad4879ccdf898 Gerrit-Change-Number: 10479 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 07:09:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:09:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:09:40 +0000 Subject: Change in osmo-mgw[master]: vty: Fix typo writing bts-jitter-buffer-delay-{min, max} In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10479 ) Change subject: vty: Fix typo writing bts-jitter-buffer-delay-{min,max} ...................................................................... vty: Fix typo writing bts-jitter-buffer-delay-{min,max} Change-Id: I15ec1bd9e8d2241d29ef64cefe7ad4879ccdf898 --- M src/libosmo-legacy-mgcp/mgcp_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-legacy-mgcp/mgcp_vty.c b/src/libosmo-legacy-mgcp/mgcp_vty.c index be884cb..420333d 100644 --- a/src/libosmo-legacy-mgcp/mgcp_vty.c +++ b/src/libosmo-legacy-mgcp/mgcp_vty.c @@ -168,9 +168,9 @@ if (g_cfg->bts_use_jibuf) vty_out(vty, " bts-jitter-buffer%s", VTY_NEWLINE); if (g_cfg->bts_jitter_delay_min) - vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); if (g_cfg->bts_jitter_delay_max) - vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); + vty_out(vty, " bts-jitter-buffer-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10479 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I15ec1bd9e8d2241d29ef64cefe7ad4879ccdf898 Gerrit-Change-Number: 10479 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:10:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:10:09 +0000 Subject: Change in osmo-sgsn[master]: Drop gprs_msgb_copy with libosmocore replacement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10461 ) Change subject: Drop gprs_msgb_copy with libosmocore replacement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42a65fd8e4045fafadf5694f2d8d0c5e7ab350a0 Gerrit-Change-Number: 10461 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 07:10:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:10:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:10:23 +0000 Subject: Change in osmo-sgsn[master]: Drop gprs_msgb_resize_area with libosmocore replacement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10462 ) Change subject: Drop gprs_msgb_resize_area with libosmocore replacement ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c Gerrit-Change-Number: 10462 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 17 Aug 2018 07:10:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:36:34 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add VTY parameter: link stored-msgs-max-length In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10477 ) Change subject: gbproxy: Add VTY parameter: link stored-msgs-max-length ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10477/1/src/gprs/gb_proxy.c File src/gprs/gb_proxy.c: https://gerrit.osmocom.org/#/c/10477/1/src/gprs/gb_proxy.c at 347 PS1, Line 347: stored_msgs_len I think this explicit cache of the queue length is prone to danger, expecially as there are a number of lines in between the dequeue and changing this member. I think it's best to introduce something like helper functions msgb_dequeue_count(&queue, &count) and msgb_encqueue_count(&queue, &count). This way the count is maintained in the exact same function call where the enqueue/dequeue happens. What do you think? I think as generic helpers in libosmocore this can be useful in other places. -- To view, visit https://gerrit.osmocom.org/10477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 Gerrit-Change-Number: 10477 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 07:36:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:36:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:36:39 +0000 Subject: Change in osmo-sgsn[master]: Drop gprs_msgb_copy with libosmocore replacement In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10461 ) Change subject: Drop gprs_msgb_copy with libosmocore replacement ...................................................................... Drop gprs_msgb_copy with libosmocore replacement gprs_msgb_copy was introduced in libosmocore 0.94 (f78ec5ce0d0f6038147d9b9e14d81094309ba5d5) as bssgp_msgb_copy. Let's use that one to avoid code duplication. Change-Id: I42a65fd8e4045fafadf5694f2d8d0c5e7ab350a0 --- M include/osmocom/sgsn/gprs_utils.h M src/gprs/gb_proxy.c M src/gprs/gprs_gmm.c M src/gprs/gprs_utils.c M tests/gbproxy/gbproxy_test.c 5 files changed, 6 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_utils.h b/include/osmocom/sgsn/gprs_utils.h index e06364d..8e47e90 100644 --- a/include/osmocom/sgsn/gprs_utils.h +++ b/include/osmocom/sgsn/gprs_utils.h @@ -29,7 +29,6 @@ struct msgb; struct gprs_ra_id; -struct msgb *gprs_msgb_copy(const struct msgb *msg, const char *name); int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, size_t old_size, size_t new_size); int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str); diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 447772f..dc3c810 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -499,7 +499,7 @@ msgb_nsei(msg), parse_ctx->llc_msg_name ? parse_ctx->llc_msg_name : "BSSGP"); - stored_msg = gprs_msgb_copy(msg, "process_bssgp_ul"); + stored_msg = bssgp_msgb_copy(msg, "process_bssgp_ul"); msgb_enqueue(&link_info->stored_msgs, stored_msg); if (!link_info->imsi_acq_pending) { @@ -763,7 +763,7 @@ { /* create a copy of the message so the old one can * be free()d safely when we return from gbprox_rcvmsg() */ - struct msgb *msg = gprs_msgb_copy(old_msg, "msgb_relay2sgsn"); + struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2sgsn"); int rc; DEBUGP(DGPRS, "NSEI=%u proxying BTS->SGSN (NS_BVCI=%u, NSEI=%u)\n", @@ -787,7 +787,7 @@ { /* create a copy of the message so the old one can * be free()d safely when we return from gbprox_rcvmsg() */ - struct msgb *msg = gprs_msgb_copy(old_msg, "msgb_relay2peer"); + struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2peer"); int rc; DEBUGP(DGPRS, "NSEI=%u proxying SGSN->BSS (NS_BVCI=%u, NSEI=%u)\n", @@ -1179,7 +1179,7 @@ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, orig_msg); } - msg = gprs_msgb_copy(orig_msg, "rx_sig_from_sgsn"); + msg = bssgp_msgb_copy(orig_msg, "rx_sig_from_sgsn"); gbprox_process_bssgp_dl(cfg, msg, NULL); /* Update message info */ bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg); diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 91f769d..bea63dc 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2648,7 +2648,7 @@ * and the dynamic resolution will be the right thing * in the long run. */ - msg = gprs_msgb_copy(_msg, __func__); + msg = bssgp_msgb_copy(_msg, __func__); if (!msg) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(_msg); uint8_t transaction_id = gsm48_hdr_trans_id(gh); diff --git a/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c index d7cef1c..c4b66d6 100644 --- a/src/gprs/gprs_utils.c +++ b/src/gprs/gprs_utils.c @@ -30,55 +30,6 @@ #include -/* FIXME: this needs to go to libosmocore/msgb.c */ -struct msgb *gprs_msgb_copy(const struct msgb *msg, const char *name) -{ - struct libgb_msgb_cb *old_cb, *new_cb; - struct msgb *new_msg; - - new_msg = msgb_alloc(msg->data_len, name); - if (!new_msg) - return NULL; - - /* copy data */ - memcpy(new_msg->_data, msg->_data, new_msg->data_len); - - /* copy header */ - new_msg->len = msg->len; - new_msg->data += msg->data - msg->_data; - new_msg->head += msg->head - msg->_data; - new_msg->tail += msg->tail - msg->_data; - - if (msg->l1h) - new_msg->l1h = new_msg->_data + (msg->l1h - msg->_data); - if (msg->l2h) - new_msg->l2h = new_msg->_data + (msg->l2h - msg->_data); - if (msg->l3h) - new_msg->l3h = new_msg->_data + (msg->l3h - msg->_data); - if (msg->l4h) - new_msg->l4h = new_msg->_data + (msg->l4h - msg->_data); - - /* copy GB specific data */ - old_cb = LIBGB_MSGB_CB(msg); - new_cb = LIBGB_MSGB_CB(new_msg); - - if (old_cb->bssgph) - new_cb->bssgph = new_msg->_data + (old_cb->bssgph - msg->_data); - if (old_cb->llch) - new_cb->llch = new_msg->_data + (old_cb->llch - msg->_data); - - /* bssgp_cell_id is a pointer into the old msgb, so we need to make - * it a pointer into the new msgb */ - if (old_cb->bssgp_cell_id) - new_cb->bssgp_cell_id = new_msg->_data + - (old_cb->bssgp_cell_id - msg->_data); - new_cb->nsei = old_cb->nsei; - new_cb->bvci = old_cb->bvci; - new_cb->tlli = old_cb->tlli; - - return new_msg; -} - /* TODO: Move this to libosmocore/msgb.c */ int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, size_t old_size, size_t new_size) diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c index 157da8b..a183320 100644 --- a/tests/gbproxy/gbproxy_test.c +++ b/tests/gbproxy/gbproxy_test.c @@ -1061,7 +1061,7 @@ if (received_messages) { struct msgb *msg_copy; - msg_copy = gprs_msgb_copy(msg, "received_messages"); + msg_copy = bssgp_msgb_copy(msg, "received_messages"); llist_add_tail(&msg_copy->list, received_messages); } -- To view, visit https://gerrit.osmocom.org/10461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I42a65fd8e4045fafadf5694f2d8d0c5e7ab350a0 Gerrit-Change-Number: 10461 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:36:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:36:39 +0000 Subject: Change in osmo-sgsn[master]: Drop gprs_msgb_resize_area with libosmocore replacement In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10462 ) Change subject: Drop gprs_msgb_resize_area with libosmocore replacement ...................................................................... Drop gprs_msgb_resize_area with libosmocore replacement gprs_msgb_resize_area was introduced in libosmocore 0.94 (f78ec5ce0d0f6038147d9b9e14d81094309ba5d5) as msgb_resize_area. Let's use that one to avoid code duplication. Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c --- M include/osmocom/sgsn/gprs_utils.h M src/gprs/gb_proxy_patch.c M src/gprs/gprs_utils.c 3 files changed, 2 insertions(+), 40 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_utils.h b/include/osmocom/sgsn/gprs_utils.h index 8e47e90..eacaec7 100644 --- a/include/osmocom/sgsn/gprs_utils.h +++ b/include/osmocom/sgsn/gprs_utils.h @@ -29,8 +29,6 @@ struct msgb; struct gprs_ra_id; -int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, - size_t old_size, size_t new_size); int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str); /* GSM 04.08, 10.5.7.3 GPRS Timer */ diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c index 496f605..9cca9a8 100644 --- a/src/gprs/gb_proxy_patch.c +++ b/src/gprs/gb_proxy_patch.c @@ -112,7 +112,7 @@ osmo_apn_to_str(str1, apn, apn_len)); *new_apn_ie_len = 0; - gprs_msgb_resize_area(msg, apn_ie, apn_ie_len, 0); + msgb_resize_area(msg, apn_ie, apn_ie_len, 0); } else { /* Resize the IE */ char str1[110]; @@ -129,7 +129,7 @@ peer->cfg->core_apn_size)); *new_apn_ie_len = peer->cfg->core_apn_size + 2; - gprs_msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size); + msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size); memcpy(apn, peer->cfg->core_apn, peer->cfg->core_apn_size); hdr->apn_len = peer->cfg->core_apn_size; } @@ -463,4 +463,3 @@ return 1; } - diff --git a/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c index c4b66d6..13641c1 100644 --- a/src/gprs/gprs_utils.c +++ b/src/gprs/gprs_utils.c @@ -30,41 +30,6 @@ #include -/* TODO: Move this to libosmocore/msgb.c */ -int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area, - size_t old_size, size_t new_size) -{ - int rc; - uint8_t *rest = area + old_size; - int rest_len = msg->len - old_size - (area - msg->data); - int delta_size = (int)new_size - (int)old_size; - - if (delta_size == 0) - return 0; - - if (delta_size > 0) { - rc = msgb_trim(msg, msg->len + delta_size); - if (rc < 0) - return rc; - } - - memmove(area + new_size, area + old_size, rest_len); - - if (msg->l1h >= rest) - msg->l1h += delta_size; - if (msg->l2h >= rest) - msg->l2h += delta_size; - if (msg->l3h >= rest) - msg->l3h += delta_size; - if (msg->l4h >= rest) - msg->l4h += delta_size; - - if (delta_size < 0) - msgb_trim(msg, msg->len + delta_size); - - return 0; -} - int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str) { uint8_t *last_len_field; -- To view, visit https://gerrit.osmocom.org/10462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c Gerrit-Change-Number: 10462 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 07:59:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 07:59:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10414 ) Change subject: update DTX fill frame test expectations ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 07:59:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 08:03:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 08:03:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: update DTX fill frame test expectations In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10414 ) Change subject: update DTX fill frame test expectations ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/#/c/10414/1/bts/BTS_Tests.ttcn at 3840 PS1, Line 3840: 52, 53, 54, 55, 56, 57, 58, 5 > I have made some changes that I believe align with your suggestions, which I will push here soon. [?] I cannot tell what's going on. If L1SAP is sending the frame, you should be receiving it on L1CTL. If not, there's a bug somewhere in betewen, IMHO. Should we merge this patch now? Does it reliably reproduce the above? -- To view, visit https://gerrit.osmocom.org/10414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie573b54ab5654f027c470aa7a565d2b5b97dc74b Gerrit-Change-Number: 10414 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 08:03:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 08:05:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 08:05:17 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Fix build if required kernel modules are built-in in kernel In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10484 ) Change subject: osmo-ggsn: Fix build if required kernel modules are built-in in kernel ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I2e0d1fbcffc5f72980878ac76072d9de5fc0c690 Gerrit-Change-Number: 10484 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 17 Aug 2018 08:05:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 08:05:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 08:05:19 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Fix build if required kernel modules are built-in in kernel In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10484 ) Change subject: osmo-ggsn: Fix build if required kernel modules are built-in in kernel ...................................................................... osmo-ggsn: Fix build if required kernel modules are built-in in kernel If kernel being built has some of the required modules built-in, package for that module is not generated, and so dependencies wil lfail at install time during image generation. Change-Id: I2e0d1fbcffc5f72980878ac76072d9de5fc0c690 --- M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 58f00ec..8c948cc 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -15,7 +15,8 @@ DEPENDS = "libosmocore" PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu" -RDEPENDS_${PN} += "iptables kernel-module-ipt-masquerade kernel-module-tun" +RDEPENDS_${PN} += "iptables" +RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun" inherit autotools update-rc.d pkgconfig systemd -- To view, visit https://gerrit.osmocom.org/10484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I2e0d1fbcffc5f72980878ac76072d9de5fc0c690 Gerrit-Change-Number: 10484 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 08:05:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 08:05:42 +0000 Subject: Change in osmo-msc[master]: msc: Set talloc ctx for osmo_signal structures In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10482 ) Change subject: msc: Set talloc ctx for osmo_signal structures ...................................................................... msc: Set talloc ctx for osmo_signal structures Otherwise they end up in the NULL ctx. Depends: libosmocore Change-Id Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Change-Id: I5d5b456eb85fbdb0ca2140c56ebf3d207b4a0bba --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 1a10278..f87a95e 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -530,6 +530,7 @@ msc_vty_info.tall_ctx = tall_msc_ctx; msgb_talloc_ctx_init(tall_msc_ctx, 0); + osmo_signal_talloc_ctx_init(tall_msc_ctx); tall_gsms_ctx = talloc_named_const(tall_msc_ctx, 0, "sms"); tall_call_ctx = talloc_named_const(tall_msc_ctx, 0, "gsm_call"); tall_trans_ctx = talloc_named_const(tall_msc_ctx, 0, "transaction"); -- To view, visit https://gerrit.osmocom.org/10482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5d5b456eb85fbdb0ca2140c56ebf3d207b4a0bba Gerrit-Change-Number: 10482 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 08:05:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 08:05:46 +0000 Subject: Change in osmo-bsc[master]: bsc: Use libosmocore API to track osmo_signal structs In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10483 ) Change subject: bsc: Use libosmocore API to track osmo_signal structs ...................................................................... bsc: Use libosmocore API to track osmo_signal structs libosmocore recently had the new API introduced for this purpose. Depends: libosmocore Change-Id Id58ca18eb826b8f4183a7cf0dbb2b38cba702a09 Change-Id: Id07260635327617f8da5050af1e906891a89c530 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 37e8665..8ff0e8a 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -783,7 +783,6 @@ extern void *tall_paging_ctx; extern void *tall_fle_ctx; -extern void *tall_sigh_ctx; extern void *tall_tqe_ctx; extern void *tall_ctr_ctx; @@ -795,12 +794,12 @@ tall_bsc_ctx = talloc_named_const(NULL, 1, "osmo-bsc"); msgb_talloc_ctx_init(tall_bsc_ctx, 0); + osmo_signal_talloc_ctx_init(tall_bsc_ctx); osmo_xua_msg_tall_ctx_init(tall_bsc_ctx); vty_info.tall_ctx = tall_bsc_ctx; tall_paging_ctx = talloc_named_const(tall_bsc_ctx, 0, "paging_request"); tall_fle_ctx = talloc_named_const(tall_bsc_ctx, 0, "bs11_file_list_entry"); - tall_sigh_ctx = talloc_named_const(tall_bsc_ctx, 0, "signal_handler"); tall_tqe_ctx = talloc_named_const(tall_bsc_ctx, 0, "subch_txq_entry"); tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter"); -- To view, visit https://gerrit.osmocom.org/10483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id07260635327617f8da5050af1e906891a89c530 Gerrit-Change-Number: 10483 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 08:35:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 08:35:46 +0000 Subject: Change in libosmocore[master]: msgb: Introduce msgb_{de, en}queue_count APIs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10485 Change subject: msgb: Introduce msgb_{de,en}queue_count APIs ...................................................................... msgb: Introduce msgb_{de,en}queue_count APIs It's a common pattern having a list of msgb and having to maintain its size (for instance, to limit the maximum size of the list). Having the counter updated at the same time that the msgb is enqueued or dequeued helps avoiding introducing new bugs by forgetting to update the size counter at the right places. Change-Id: I33b501e89a8f29e4aa121696bcbb13d4b83db40f --- M include/osmocom/core/msgb.h 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/10485/1 diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index a8dc205..b1cb6ec 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -81,6 +81,40 @@ while ((msg = msgb_dequeue(queue))) msgb_free(msg); } +/*! Enqueue message buffer to tail of a queue and increment queue size counter + * \param[in] queue linked list header of queue + * \param[in] msg message buffer to be added to the queue + * \param[in] count pointer to variable holding size of the queue + * + * The function will append the specified message buffer \a msg to the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * then increment \a count + */ +static inline void msgb_enqueue_count(struct llist_head *queue, struct msgb *msg, + unsigned int *count) +{ + msgb_enqueue(queue, msg); + (*count)++; +} + +/*! Dequeue message buffer from head of queue and decrement queue size counter + * \param[in] queue linked list header of queue + * \param[in] count pointer to variable holding size of the queue + * \returns message buffer (if any) or NULL if queue empty + * + * The function will remove the first message buffer from the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * and decrement \a count, all if queue is not empty. + */ +static inline struct msgb *msgb_dequeue_count(struct llist_head *queue, + unsigned int *count) +{ + struct msgb *msg = msgb_dequeue(queue); + if (msg) + (*count)--; + return msg; +} + #ifdef MSGB_DEBUG #include #define MSGB_ABORT(msg, fmt, args ...) do { \ -- To view, visit https://gerrit.osmocom.org/10485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I33b501e89a8f29e4aa121696bcbb13d4b83db40f Gerrit-Change-Number: 10485 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 08:36:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 08:36:21 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add VTY parameter: link stored-msgs-max-length In-Reply-To: References: Message-ID: Hello Stefan Sperling, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10477 to look at the new patch set (#2). Change subject: gbproxy: Add VTY parameter: link stored-msgs-max-length ...................................................................... gbproxy: Add VTY parameter: link stored-msgs-max-length It was discovered in some prod setups that some TLLIs can maintain quite long queues of msgb in case its IMSI is not acquired and the tlli is not pruned due to link-list max-{age,length} being set to 0. As a result, the osmo-gpbroxy steadly increases the list size of maintained TLLIs, and some TLLI was found without IMSI catching already 1211 msgb. Let's allow setting a maxiumum length for the queue storing those msgb in a per TLLI base. If the limit is reached, oldest msgb are removed before adding a new one. Depends: libosmocore Change-Id I33b501e89a8f29e4aa121696bcbb13d4b83db40f Related: SYS#4297 Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 --- M include/osmocom/sgsn/gb_proxy.h M src/gprs/gb_proxy.c M src/gprs/gb_proxy_vty.c 3 files changed, 59 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/77/10477/2 -- To view, visit https://gerrit.osmocom.org/10477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 Gerrit-Change-Number: 10477 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 11:27:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 11:27:31 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10486 Change subject: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer ...................................................................... gbproxy: Add new VTY-managed timer: link-list clean-stale-timer This timer allows periodically cleaning up stale links in link-list of each gbproxy_peer. Previous to this patch, this kind of cleanup (gbproxy_remove_stale_link_infos) was being done only as a consequence of external events being triggered, such as a message from that peer being received. It was found in a production network agreggating several BSS that some of them were offline for a longtime but gbproxy was still caching big amounts of really old link_info for the NSEI assigned to those BSS, because since they were probably turned off abruptely, no new messages were received from it which would trigger the cleanup. As a consequence, it has been observed that a timer to periodically clean up old entries (link-list max-age) is requird in case w don't receive messages from that NSEI periodically. Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a --- M include/osmocom/sgsn/gb_proxy.h M src/gprs/gb_proxy_peer.c M src/gprs/gb_proxy_vty.c 3 files changed, 67 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/86/10486/1 diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 16082fc..7e2ae42 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -105,6 +105,8 @@ struct osmo_plmn_id core_plmn; uint8_t* core_apn; size_t core_apn_size; + /* Frequency (sec) at which timer to clean stale links is fired (0 disabled) */ + unsigned int clean_stale_timer_freq; /* If !0, Max age to consider a struct gbproxy_link_info as stale */ int tlli_max_age; /* If !0, Max len of gbproxy_peer->list (list of struct gbproxy_link_info) */ @@ -151,6 +153,9 @@ struct rate_ctr_group *ctrg; struct gbproxy_patch_state patch_state; + + /* Fired periodically to clean up stale links from list */ + struct osmo_timer_list clean_stale_timer; }; struct gbproxy_tlli_state { diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c index f2cdd93..8e28fc4 100644 --- a/src/gprs/gb_proxy_peer.c +++ b/src/gprs/gb_proxy_peer.c @@ -167,6 +167,19 @@ return NULL; } +static void clean_stale_timer_cb(void *data) +{ + time_t now; + struct timespec ts = {0,}; + struct gbproxy_peer *peer = (struct gbproxy_peer *) data; + + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); + now = ts.tv_sec; + gbproxy_remove_stale_link_infos(peer, now); + if (peer->cfg->clean_stale_timer_freq != 0) + osmo_timer_schedule(&peer->clean_stale_timer, + peer->cfg->clean_stale_timer_freq, 0); +} struct gbproxy_peer *gbproxy_peer_alloc(struct gbproxy_config *cfg, uint16_t bvci) { @@ -188,13 +201,18 @@ INIT_LLIST_HEAD(&peer->patch_state.logical_links); + osmo_timer_setup(&peer->clean_stale_timer, clean_stale_timer_cb, peer); + if (peer->cfg->clean_stale_timer_freq != 0) + osmo_timer_schedule(&peer->clean_stale_timer, + peer->cfg->clean_stale_timer_freq, 0); + return peer; } void gbproxy_peer_free(struct gbproxy_peer *peer) { llist_del(&peer->list); - + osmo_timer_del(&peer->clean_stale_timer); gbproxy_delete_link_infos(peer); rate_ctr_group_free(peer->ctrg); @@ -220,4 +238,3 @@ return counter; } - diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c index dc0b502..ed5613e 100644 --- a/src/gprs/gb_proxy_vty.c +++ b/src/gprs/gb_proxy_vty.c @@ -120,6 +120,9 @@ vty_out(vty, " secondary-sgsn nsei %u%s", g_cfg->nsip_sgsn2_nsei, VTY_NEWLINE); + if (g_cfg->clean_stale_timer_freq > 0) + vty_out(vty, " link-list clean-stale-timer %u%s", + g_cfg->clean_stale_timer_freq, VTY_NEWLINE); if (g_cfg->tlli_max_age > 0) vty_out(vty, " link-list max-age %d%s", g_cfg->tlli_max_age, VTY_NEWLINE); @@ -407,6 +410,44 @@ #define GBPROXY_LINK_LIST_STR "Set TLLI list parameters\n" #define GBPROXY_LINK_STR "Set TLLI parameters\n" + +#define GBPROXY_CLEAN_STALE_TIMER_STR "Periodic timer to clean stale links\n" + +DEFUN(cfg_gbproxy_link_list_clean_stale_timer, + cfg_gbproxy_link_list_clean_stale_timer_cmd, + "link-list clean-stale-timer <1-999999>", + GBPROXY_LINK_LIST_STR GBPROXY_CLEAN_STALE_TIMER_STR + "Frequency at which the periodic timer is fired (in seconds)\n") +{ + struct gbproxy_peer *peer; + g_cfg->clean_stale_timer_freq = (unsigned int) atoi(argv[0]); + + /* Re-schedule running timers soon in case prev frequency was really big + and new frequency is desired to be lower. After initial run, periodic + time is used. Use random() to avoid firing timers for all peers at + the same time */ + llist_for_each_entry(peer, &g_cfg->bts_peers, list) + osmo_timer_schedule(&peer->clean_stale_timer, + random() % 5, random() % 1000000); + + return CMD_SUCCESS; +} + +DEFUN(cfg_gbproxy_link_list_no_clean_stale_timer, + cfg_gbproxy_link_list_no_clean_stale_timer_cmd, + "no link-list clean-stale-timer", + NO_STR GBPROXY_LINK_LIST_STR GBPROXY_CLEAN_STALE_TIMER_STR) + +{ + struct gbproxy_peer *peer; + g_cfg->clean_stale_timer_freq = 0; + + llist_for_each_entry(peer, &g_cfg->bts_peers, list) + osmo_timer_del(&peer->clean_stale_timer); + + return CMD_SUCCESS; +} + #define GBPROXY_MAX_AGE_STR "Limit maximum age\n" DEFUN(cfg_gbproxy_link_list_max_age, @@ -846,6 +887,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_secondary_sgsn_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_patch_ptmsi_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_acquire_imsi_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_clean_stale_timer_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_keep_mode_cmd); @@ -857,6 +899,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_no_secondary_sgsn_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_patch_ptmsi_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_acquire_imsi_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_clean_stale_timer_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_no_stored_msgs_max_len_cmd); -- To view, visit https://gerrit.osmocom.org/10486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a Gerrit-Change-Number: 10486 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 11:27:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 11:27:31 +0000 Subject: Change in osmo-sgsn[master]: Use osmo_clock_gettime from libosmocore Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10487 Change subject: Use osmo_clock_gettime from libosmocore ...................................................................... Use osmo_clock_gettime from libosmocore Change-Id: Ic638849c6687c376c4c0c36cc286d499a073d6ca --- M src/gprs/gb_proxy.c M src/gprs/gb_proxy_vty.c M src/gprs/gprs_llc_vty.c M src/gprs/gprs_sgsn.c M src/gprs/gtphub.c M src/gprs/sgsn_cdr.c 6 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/87/10487/1 diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 8bf3d37..8bb6789 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -611,7 +611,7 @@ return 0; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; gbprox_update_current_raid(parse_ctx.bssgp_raid_enc, peer, @@ -727,7 +727,7 @@ if (!peer) return; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; if (parse_ctx.g48_hdr) { @@ -1452,7 +1452,7 @@ LOGP(DGPRS, LOGL_ERROR, "Cannot allocate global counter group!\n"); return -1; } - clock_gettime(CLOCK_REALTIME, &tp); + osmo_clock_gettime(CLOCK_REALTIME, &tp); return 0; } diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c index ed5613e..52c39fd 100644 --- a/src/gprs/gb_proxy_vty.c +++ b/src/gprs/gb_proxy_vty.c @@ -558,7 +558,7 @@ time_t now; struct timespec ts = {0,}; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; llist_for_each_entry(peer, &g_cfg->bts_peers, list) { @@ -792,7 +792,7 @@ state = &peer->patch_state; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; if (match == MATCH_STALE) { diff --git a/src/gprs/gprs_llc_vty.c b/src/gprs/gprs_llc_vty.c index 1433efe..418be83 100644 --- a/src/gprs/gprs_llc_vty.c +++ b/src/gprs/gprs_llc_vty.c @@ -71,7 +71,7 @@ { unsigned int i; struct timespec now_tp = {0}; - clock_gettime(CLOCK_MONOTONIC, &now_tp); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp); vty_out(vty, "TLLI %08x (Old TLLI %08x) BVCI=%u NSEI=%u %s: " "IOV-UI=0x%06x CKSN=%d Age=%d: State %s%s", llme->tlli, diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 9046157..d8bca85 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -936,7 +936,7 @@ int rc; - rc = clock_gettime(CLOCK_MONOTONIC, &now_tp); + rc = osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp); OSMO_ASSERT(rc >= 0); now = now_tp.tv_sec; diff --git a/src/gprs/gtphub.c b/src/gprs/gtphub.c index 4ee20cd..ca5857b 100644 --- a/src/gprs/gtphub.c +++ b/src/gprs/gtphub.c @@ -791,7 +791,7 @@ time_t gtphub_now(void) { struct timespec now_tp; - OSMO_ASSERT(clock_gettime(CLOCK_MONOTONIC, &now_tp) >= 0); + OSMO_ASSERT(osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp) >= 0); return now_tp.tv_sec; } diff --git a/src/gprs/sgsn_cdr.c b/src/gprs/sgsn_cdr.c index 7380e74..93ed0af 100644 --- a/src/gprs/sgsn_cdr.c +++ b/src/gprs/sgsn_cdr.c @@ -177,7 +177,7 @@ if (pdp->ggsn) inet_ntop(AF_INET, &pdp->ggsn->gsn->gsnc.s_addr, sgsn_addr, sizeof(sgsn_addr)); - clock_gettime(CLOCK_MONOTONIC, &tp); + osmo_clock_gettime(CLOCK_MONOTONIC, &tp); gettimeofday(&tv, NULL); /* convert the timestamp to UTC */ @@ -267,7 +267,7 @@ cdr_log_mm(inst, "free", signal_data->mm); break; case S_SGSN_PDP_ACT: - clock_gettime(CLOCK_MONOTONIC, &signal_data->pdp->cdr_start); + osmo_clock_gettime(CLOCK_MONOTONIC, &signal_data->pdp->cdr_start); signal_data->pdp->cdr_charging_id = signal_data->pdp->lib->cid; cdr_log_pdp(inst, "pdp-act", signal_data->pdp); osmo_timer_setup(&signal_data->pdp->cdr_timer, cdr_pdp_timeout, -- To view, visit https://gerrit.osmocom.org/10487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic638849c6687c376c4c0c36cc286d499a073d6ca Gerrit-Change-Number: 10487 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 12:36:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 17 Aug 2018 12:36:14 +0000 Subject: Change in osmo-bts[master]: fix timespec subtraction in compute_elapsed_us() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10488 Change subject: fix timespec subtraction in compute_elapsed_us() ...................................................................... fix timespec subtraction in compute_elapsed_us() The previous implementation unconditionally subtracted nanosecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() instead, which accounts for nanoseconds correctly. This is a similar bug as fixed in osmo-pcu for issue OS#3225 While here, switch variables which are calculated based on struct timespec to 64 bit types. While probably not strictly necessary in practice, this makes the types used in calculations more compatible. Change-Id: Idfd9c807e35cd7fb5c80625b9746121f81c24599 Related: OS#3467 Related: OS#3225 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/10488/1 diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 4ab937a..4bac235 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -1409,13 +1410,12 @@ #define TRX_LOSS_FRAMES 400 /*! compute the number of micro-seconds difference elapsed between \a last and \a now */ -static inline int compute_elapsed_us(const struct timespec *last, const struct timespec *now) +static inline int64_t compute_elapsed_us(const struct timespec *last, const struct timespec *now) { - int elapsed; + struct timespec elapsed; - elapsed = (now->tv_sec - last->tv_sec) * 1000000 - + (now->tv_nsec - last->tv_nsec) / 1000; - return elapsed; + timespecsub(now, last, &elapsed); + return (int64_t)(elapsed.tv_sec * 1000000) + (elapsed.tv_nsec / 1000); } /*! compute the number of frame number intervals elapsed between \a last and \a now */ @@ -1508,8 +1508,7 @@ struct osmo_trx_clock_state *tcs = &g_clk_s; struct timespec tv_now; uint64_t expire_count; - int elapsed_us; - int error_us; + int64_t elapsed_us, error_us; int rc, i; if (!(what & BSC_FD_READ)) @@ -1537,14 +1536,14 @@ elapsed_us = compute_elapsed_us(&tcs->last_fn_timer.tv, &tv_now); error_us = elapsed_us - FRAME_DURATION_uS; #ifdef DEBUG_CLOCK - printf("%s(): %09ld, elapsed_us=%05d, error_us=%-d: fn=%d\n", __func__, + printf("%s(): %09ld, elapsed_us=%05" PRId64 ", error_us=%-d: fn=%d\n", __func__, tv_now.tv_nsec, elapsed_us, error_us, tcs->last_fn_timer.fn+1); #endif tcs->last_fn_timer.tv = tv_now; /* if someone played with clock, or if the process stalled */ if (elapsed_us > FRAME_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) { - LOGP(DL1C, LOGL_ERROR, "PC clock skew: elapsed_us=%d, error_us=%d\n", + LOGP(DL1C, LOGL_ERROR, "PC clock skew: elapsed_us=%" PRId64 ", error_us=%" PRId64 "\n", elapsed_us, error_us); goto no_clock; } @@ -1591,8 +1590,8 @@ { struct osmo_trx_clock_state *tcs = &g_clk_s; struct timespec tv_now; - int elapsed_us, elapsed_fn; - int64_t elapsed_us_since_clk, elapsed_fn_since_clk, error_us_since_clk; + int elapsed_fn; + int64_t elapsed_us, elapsed_us_since_clk, elapsed_fn_since_clk, error_us_since_clk; unsigned int fn_caught_up = 0; const struct timespec interval = { .tv_sec = 0, .tv_nsec = FRAME_DURATION_nS }; @@ -1655,7 +1654,7 @@ return trx_setup_clock(bts, tcs, &tv_now, &interval, fn); } - LOGP(DL1C, LOGL_INFO, "GSM clock jitter: %d us (elapsed_fn=%d)\n", + LOGP(DL1C, LOGL_INFO, "GSM clock jitter: %" PRId64 "us (elapsed_fn=%d)\n", elapsed_fn * FRAME_DURATION_uS - elapsed_us, elapsed_fn); /* too many frames have been processed already */ -- To view, visit https://gerrit.osmocom.org/10488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idfd9c807e35cd7fb5c80625b9746121f81c24599 Gerrit-Change-Number: 10488 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 12:43:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 17 Aug 2018 12:43:47 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10489 Change subject: fix time delta calculations in sched_clck.c ...................................................................... fix time delta calculations in sched_clck.c Use osmo_clock_gettime() to read the monotonic clock instead of gettimeofday() which could drift backwards. This requires switching the scheduler clock from struct timeval to struct timespec. Expand some variables to 64 bits in order to keep types used in calculations compatible. The previous implementation unconditionally subtracted microsecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() for the subtraction instead which accounts for fractions of a second correctly. Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Related: OS#3467 --- M src/host/trxcon/sched_clck.c M src/host/trxcon/scheduler.h 2 files changed, 33 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/10489/1 diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 59cffb2..0707232 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -27,12 +27,15 @@ #include #include #include +#include #include #include #include #include #include +#include +#include #include #include "scheduler.h" @@ -47,8 +50,9 @@ static void sched_clck_tick(void *data) { struct trx_sched *sched = (struct trx_sched *) data; - struct timeval tv_now, *tv_clock; - int32_t elapsed; + struct timespec tv_now, *tv_clock, elapsed; + int64_t elapsed_us; + const struct timespec frame_duration = { .tv_sec = 0, .tv_nsec = FRAME_DURATION_uS * 1000 }; /* Check if transceiver is still alive */ if (sched->fn_counter_lost++ == TRX_LOSS_FRAMES) { @@ -59,16 +63,16 @@ } /* Get actual / previous frame time */ - gettimeofday(&tv_now, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); tv_clock = &sched->clock; - elapsed = (tv_now.tv_sec - tv_clock->tv_sec) * 1000000 - + (tv_now.tv_usec - tv_clock->tv_usec); + timespecsub(&tv_now, tv_clock, &elapsed); + elapsed_us = (elapsed.tv_sec * 1000000) + (elapsed.tv_nsec / 1000); /* If someone played with clock, or if the process stalled */ - if (elapsed > FRAME_DURATION_uS * MAX_FN_SKEW || elapsed < 0) { + if (elapsed_us > FRAME_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) { LOGP(DSCH, LOGL_NOTICE, "PC clock skew: " - "elapsed uS %d\n", elapsed); + "elapsed uS %" PRIu64 "\n", elapsed_us); sched->state = SCH_CLCK_STATE_WAIT; @@ -76,14 +80,11 @@ } /* Schedule next FN clock */ - while (elapsed > FRAME_DURATION_uS / 2) { - tv_clock->tv_usec += FRAME_DURATION_uS; - elapsed -= FRAME_DURATION_uS; - - if (tv_clock->tv_usec >= 1000000) { - tv_clock->tv_sec++; - tv_clock->tv_usec -= 1000000; - } + while (elapsed_us > FRAME_DURATION_uS / 2) { + struct timespec next; + timespecadd(tv_clock, &frame_duration, &next); + *tv_clock = next; + elapsed_us -= FRAME_DURATION_uS; sched->fn_counter_proc = (sched->fn_counter_proc + 1) % GSM_HYPERFRAME; @@ -94,11 +95,11 @@ } osmo_timer_schedule(&sched->clock_timer, 0, - FRAME_DURATION_uS - elapsed); + FRAME_DURATION_uS - elapsed_us); } static void sched_clck_correct(struct trx_sched *sched, - struct timeval *tv_now, uint32_t fn) + struct timespec *tv_now, uint32_t fn) { sched->fn_counter_proc = fn; @@ -107,7 +108,7 @@ sched->clock_cb(sched); /* Schedule first FN clock */ - memcpy(&sched->clock, tv_now, sizeof(struct timeval)); + sched->clock = *tv_now; memset(&sched->clock_timer, 0, sizeof(sched->clock_timer)); sched->clock_timer.cb = sched_clck_tick; @@ -117,14 +118,14 @@ int sched_clck_handle(struct trx_sched *sched, uint32_t fn) { - struct timeval tv_now, *tv_clock; - int32_t elapsed, elapsed_fn; + struct timespec tv_now, *tv_clock, elapsed; + int64_t elapsed_us, elapsed_fn; /* Reset lost counter */ sched->fn_counter_lost = 0; /* Get actual / previous frame time */ - gettimeofday(&tv_now, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); tv_clock = &sched->clock; /* If this is the first CLCK IND */ @@ -142,8 +143,8 @@ osmo_timer_del(&sched->clock_timer); /* Calculate elapsed time / frames since last processed fn */ - elapsed = (tv_now.tv_sec - tv_clock->tv_sec) * 1000000 - + (tv_now.tv_usec - tv_clock->tv_usec); + timespecsub(&tv_now, tv_clock, &elapsed); + elapsed_us = (elapsed.tv_sec * 1000000) + (elapsed.tv_nsec / 1000); elapsed_fn = (fn + GSM_HYPERFRAME - sched->fn_counter_proc) % GSM_HYPERFRAME; @@ -159,8 +160,8 @@ return 0; } - LOGP(DSCH, LOGL_INFO, "GSM clock jitter: %d\n", - elapsed_fn * FRAME_DURATION_uS - elapsed); + LOGP(DSCH, LOGL_INFO, "GSM clock jitter: %" PRIu64 "\n", + elapsed_fn * FRAME_DURATION_uS - elapsed_us); /* Too many frames have been processed already */ if (elapsed_fn < 0) { @@ -168,14 +169,11 @@ * Set clock to the time or last FN should * have been transmitted */ - tv_clock->tv_sec = tv_now.tv_sec; - tv_clock->tv_usec = tv_now.tv_usec + - (0 - elapsed_fn) * FRAME_DURATION_uS; - - if (tv_clock->tv_usec >= 1000000) { - tv_clock->tv_sec++; - tv_clock->tv_usec -= 1000000; - } + struct timespec duration, next; + duration.tv_sec = 0; + duration.tv_nsec = (0 - elapsed_fn) * FRAME_DURATION_uS * 1000; + timespecadd(&tv_now, &duration, &next); + *tv_clock = next; /* Set time to the time our next FN has to be transmitted */ osmo_timer_schedule(&sched->clock_timer, 0, @@ -195,7 +193,7 @@ } /* Schedule next FN to be transmitted */ - memcpy(tv_clock, &tv_now, sizeof(struct timeval)); + *tv_clock = tv_now; osmo_timer_schedule(&sched->clock_timer, 0, FRAME_DURATION_uS); return 0; diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index f36c3b2..6c3a2f2 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -21,7 +21,7 @@ /*! \brief Clock state */ uint8_t state; /*! \brief Local clock source */ - struct timeval clock; + struct timespec clock; /*! \brief Count of processed frames */ uint32_t fn_counter_proc; /*! \brief Local frame counter advance */ -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 12:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 12:49:17 +0000 Subject: Change in osmo-bts[master]: fix timespec subtraction in compute_elapsed_us() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10488 ) Change subject: fix timespec subtraction in compute_elapsed_us() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfd9c807e35cd7fb5c80625b9746121f81c24599 Gerrit-Change-Number: 10488 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 17 Aug 2018 12:49:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 13:06:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 13:06:17 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 1: Code-Review-1 (6 comments) https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c File src/host/trxcon/sched_clck.c: https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 75 PS1, Line 75: "elapsed uS %" PRIu64 "\n", elapsed_us); Better cast "(uint64_t) elapsed_us", iirc I saw sometimes compilers printing warnings checking the printf format vs types passed as arguments. https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 85 PS1, Line 85: timespecadd(tv_clock, &frame_duration, &next); No need to use next here, you can do: timespecadd(tv_clock, &frame_duration, tv_clock); https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 86 PS1, Line 86: *tv_clock = next; As a result this line can be dropped, as well as the declaration of the var. https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 98 PS1, Line 98: FRAME_DURATION_uS - elapsed_us); Not related to this changeset, but wondering if this value makes sense? https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 163 PS1, Line 163: LOGP(DSCH, LOGL_INFO, "GSM clock jitter: %" PRIu64 "\n", That should be PRId64, it can be negative. https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 175 PS1, Line 175: timespecadd(&tv_now, &duration, &next); timespecadd(&tv_now, &duration, &tv_clock); then you can drop next and line below this one. -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 17 Aug 2018 13:06:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 13:15:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 17 Aug 2018 13:15:57 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10486 ) Change subject: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Based on visual inspection I don't see anything wrong. Jenkins seems unhappy, though? https://gerrit.osmocom.org/#/c/10486/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10486/1//COMMIT_MSG at 22 PS1, Line 22: Related to SYS#4431 ? -- To view, visit https://gerrit.osmocom.org/10486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a Gerrit-Change-Number: 10486 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 13:15:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 13:31:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 17 Aug 2018 13:31:57 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c File src/host/trxcon/sched_clck.c: https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 75 PS1, Line 75: "elapsed uS %" PRIu64 "\n", elapsed_us); > Better cast "(uint64_t) elapsed_us", iirc I saw sometimes compilers printing warnings checking the p [?] It's the format specifier which is wrong here. Fixed in next patch set. https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 85 PS1, Line 85: timespecadd(tv_clock, &frame_duration, &next); > No need to use next here, you can do: timespecadd(tv_clock, &frame_duration, tv_clock); I just refrained from passing the same value twice because timespecadd() is a macro. But doing so is safe in this case, indeed. https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 98 PS1, Line 98: FRAME_DURATION_uS - elapsed_us); > Not related to this changeset, but wondering if this value makes sense? Hmm. It does look weird since the scheduling time offset could be negative, right? But maybe this is being done on purpose. There's a similar case in sched_clck_handle(). https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 163 PS1, Line 163: LOGP(DSCH, LOGL_INFO, "GSM clock jitter: %" PRIu64 "\n", > That should be PRId64, it can be negative. Yes, thanks. All these are leftovers from a bad signed->unsigned move I mistakenly came up with while writing this patch. -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 13:31:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 13:39:54 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 17 Aug 2018 13:39:54 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10489 to look at the new patch set (#2). Change subject: fix time delta calculations in sched_clck.c ...................................................................... fix time delta calculations in sched_clck.c Use osmo_clock_gettime() to read the monotonic clock instead of gettimeofday() which could drift backwards. This requires switching the scheduler clock from struct timeval to struct timespec. Expand some variables to 64 bits in order to keep types used in calculations compatible. The previous implementation unconditionally subtracted microsecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() for the subtraction instead which accounts for fractions of a second correctly. Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Related: OS#3467 --- M src/host/trxcon/sched_clck.c M src/host/trxcon/scheduler.h 2 files changed, 33 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/10489/2 -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 13:48:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 13:48:30 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10486 ) Change subject: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer ...................................................................... Patch Set 1: (1 comment) Yes, jenkins fails because previous commit already depends on some libosmocore API not yet merged which I added to libosmocore after first review. https://gerrit.osmocom.org/#/c/10486/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10486/1//COMMIT_MSG at 22 PS1, Line 22: > Related to SYS#4431 ? Thanks I'll add that -- To view, visit https://gerrit.osmocom.org/10486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a Gerrit-Change-Number: 10486 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 13:48:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 13:50:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 13:50:23 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c File src/host/trxcon/sched_clck.c: https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 98 PS1, Line 98: FRAME_DURATION_uS - elapsed_us); > Hmm. It does look weird since the scheduling time offset could be negative, right? [?] I would avoid passing a negative value in there. Also worth checking what it does implementation wise in osmo_timer_schedule. -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 13:50:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 13:54:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 13:54:32 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/10489/2/src/host/trxcon/sched_clck.c File src/host/trxcon/sched_clck.c: https://gerrit.osmocom.org/#/c/10489/2/src/host/trxcon/sched_clck.c at 173 PS2, Line 173: while (duration.tv_nsec >= 1000000000) { What about something like this to avoid a loop? duration.tv_sec = duration.tv_nsec / (1000*1000*1000); duration.tv_nsec = duration.tv_nsec % (1000*1000*1000); -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 13:54:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:00:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 14:00:17 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer In-Reply-To: References: Message-ID: Hello Stefan Sperling, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10486 to look at the new patch set (#2). Change subject: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer ...................................................................... gbproxy: Add new VTY-managed timer: link-list clean-stale-timer This timer allows periodically cleaning up stale links in link-list of each gbproxy_peer. Previous to this patch, this kind of cleanup (gbproxy_remove_stale_link_infos) was being done only as a consequence of external events being triggered, such as a message from that peer being received. It was found in a production network agreggating several BSS that some of them were offline for a longtime but gbproxy was still caching big amounts of really old link_info for the NSEI assigned to those BSS, because since they were probably turned off abruptely, no new messages were received from it which would trigger the cleanup. As a consequence, it has been observed that a timer to periodically clean up old entries (link-list max-age) is requird in case w don't receive messages from that NSEI periodically. Related: SYS#4431 Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a --- M include/osmocom/sgsn/gb_proxy.h M src/gprs/gb_proxy_peer.c M src/gprs/gb_proxy_vty.c 3 files changed, 67 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/86/10486/2 -- To view, visit https://gerrit.osmocom.org/10486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a Gerrit-Change-Number: 10486 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:00:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 14:00:17 +0000 Subject: Change in osmo-sgsn[master]: Use osmo_clock_gettime from libosmocore In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10487 to look at the new patch set (#2). Change subject: Use osmo_clock_gettime from libosmocore ...................................................................... Use osmo_clock_gettime from libosmocore Change-Id: Ic638849c6687c376c4c0c36cc286d499a073d6ca --- M src/gprs/gb_proxy.c M src/gprs/gb_proxy_vty.c M src/gprs/gprs_llc_vty.c M src/gprs/gprs_sgsn.c M src/gprs/gtphub.c M src/gprs/sgsn_cdr.c 6 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/87/10487/2 -- To view, visit https://gerrit.osmocom.org/10487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic638849c6687c376c4c0c36cc286d499a073d6ca Gerrit-Change-Number: 10487 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:02:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:02:35 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 14:02:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:03:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:03:39 +0000 Subject: Change in libosmocore[master]: msgb: Introduce msgb_{de, en}queue_count APIs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10485 ) Change subject: msgb: Introduce msgb_{de,en}queue_count APIs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33b501e89a8f29e4aa121696bcbb13d4b83db40f Gerrit-Change-Number: 10485 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 14:03:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:03:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:03:45 +0000 Subject: Change in libosmocore[master]: msgb: Introduce msgb_{de, en}queue_count APIs In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10485 ) Change subject: msgb: Introduce msgb_{de,en}queue_count APIs ...................................................................... msgb: Introduce msgb_{de,en}queue_count APIs It's a common pattern having a list of msgb and having to maintain its size (for instance, to limit the maximum size of the list). Having the counter updated at the same time that the msgb is enqueued or dequeued helps avoiding introducing new bugs by forgetting to update the size counter at the right places. Change-Id: I33b501e89a8f29e4aa121696bcbb13d4b83db40f --- M include/osmocom/core/msgb.h 1 file changed, 34 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index a8dc205..b1cb6ec 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -81,6 +81,40 @@ while ((msg = msgb_dequeue(queue))) msgb_free(msg); } +/*! Enqueue message buffer to tail of a queue and increment queue size counter + * \param[in] queue linked list header of queue + * \param[in] msg message buffer to be added to the queue + * \param[in] count pointer to variable holding size of the queue + * + * The function will append the specified message buffer \a msg to the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * then increment \a count + */ +static inline void msgb_enqueue_count(struct llist_head *queue, struct msgb *msg, + unsigned int *count) +{ + msgb_enqueue(queue, msg); + (*count)++; +} + +/*! Dequeue message buffer from head of queue and decrement queue size counter + * \param[in] queue linked list header of queue + * \param[in] count pointer to variable holding size of the queue + * \returns message buffer (if any) or NULL if queue empty + * + * The function will remove the first message buffer from the queue + * implemented by \ref llist_head \a queue using function \ref msgb_enqueue_count, + * and decrement \a count, all if queue is not empty. + */ +static inline struct msgb *msgb_dequeue_count(struct llist_head *queue, + unsigned int *count) +{ + struct msgb *msg = msgb_dequeue(queue); + if (msg) + (*count)--; + return msg; +} + #ifdef MSGB_DEBUG #include #define MSGB_ABORT(msg, fmt, args ...) do { \ -- To view, visit https://gerrit.osmocom.org/10485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I33b501e89a8f29e4aa121696bcbb13d4b83db40f Gerrit-Change-Number: 10485 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:07:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:07:16 +0000 Subject: Change in meta-telephony[201705]: openbsc: Drop binaries provided by other recipes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10451 ) Change subject: openbsc: Drop binaries provided by other recipes ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc File recipes-osmocom/openbsc/openbsc.inc: https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc at 39 PS2, Line 39: osmo-bsc_mgcp is provided by osmo-mgw.bb > osmo-mgw.bb generated packages with its contents: [?] there shouldn't be any libosmo-mgcp-legacy in osmo-mgw.git. osmo-mgw should only be the "new world" whole openbsc.git contains the "old world". There shouldn't be any new useres of libosmo-mgcp-legacy beyond osmo-bsc-sccplite and bsc-nat, both of which are in openbsc.git. https://gerrit.osmocom.org/#/c/10451/2/recipes-osmocom/openbsc/openbsc.inc at 42 PS2, Line 42: provided by osmo-bsc.bb > Yes, in osmo-bsc. [?] Done -- To view, visit https://gerrit.osmocom.org/10451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If9d8976451dd642ab516fba91bd283417e57bbb5 Gerrit-Change-Number: 10451 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 14:07:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:08:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:08:01 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add VTY parameter: link stored-msgs-max-length In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10477 ) Change subject: gbproxy: Add VTY parameter: link stored-msgs-max-length ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 Gerrit-Change-Number: 10477 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 14:08:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:09:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:09:12 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10486 ) Change subject: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a Gerrit-Change-Number: 10486 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 14:09:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:09:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:09:43 +0000 Subject: Change in osmo-sgsn[master]: Use osmo_clock_gettime from libosmocore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10487 ) Change subject: Use osmo_clock_gettime from libosmocore ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic638849c6687c376c4c0c36cc286d499a073d6ca Gerrit-Change-Number: 10487 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 14:09:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:10:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:10:14 +0000 Subject: Change in osmo-sgsn[master]: Use osmo_clock_gettime from libosmocore In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10487 ) Change subject: Use osmo_clock_gettime from libosmocore ...................................................................... Use osmo_clock_gettime from libosmocore Change-Id: Ic638849c6687c376c4c0c36cc286d499a073d6ca --- M src/gprs/gb_proxy.c M src/gprs/gb_proxy_vty.c M src/gprs/gprs_llc_vty.c M src/gprs/gprs_sgsn.c M src/gprs/gtphub.c M src/gprs/sgsn_cdr.c 6 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index dc3c810..f834ed3 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -591,7 +591,7 @@ return 0; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; gbprox_update_current_raid(parse_ctx.bssgp_raid_enc, peer, @@ -707,7 +707,7 @@ if (!peer) return; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; if (parse_ctx.g48_hdr) { @@ -1432,7 +1432,7 @@ LOGP(DGPRS, LOGL_ERROR, "Cannot allocate global counter group!\n"); return -1; } - clock_gettime(CLOCK_REALTIME, &tp); + osmo_clock_gettime(CLOCK_REALTIME, &tp); return 0; } diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c index d7d35fe..cd10abf 100644 --- a/src/gprs/gb_proxy_vty.c +++ b/src/gprs/gb_proxy_vty.c @@ -491,7 +491,7 @@ time_t now; struct timespec ts = {0,}; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; llist_for_each_entry(peer, &g_cfg->bts_peers, list) { @@ -727,7 +727,7 @@ state = &peer->patch_state; - clock_gettime(CLOCK_MONOTONIC, &ts); + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); now = ts.tv_sec; if (match == MATCH_STALE) { diff --git a/src/gprs/gprs_llc_vty.c b/src/gprs/gprs_llc_vty.c index 1433efe..418be83 100644 --- a/src/gprs/gprs_llc_vty.c +++ b/src/gprs/gprs_llc_vty.c @@ -71,7 +71,7 @@ { unsigned int i; struct timespec now_tp = {0}; - clock_gettime(CLOCK_MONOTONIC, &now_tp); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp); vty_out(vty, "TLLI %08x (Old TLLI %08x) BVCI=%u NSEI=%u %s: " "IOV-UI=0x%06x CKSN=%d Age=%d: State %s%s", llme->tlli, diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 9046157..d8bca85 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -936,7 +936,7 @@ int rc; - rc = clock_gettime(CLOCK_MONOTONIC, &now_tp); + rc = osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp); OSMO_ASSERT(rc >= 0); now = now_tp.tv_sec; diff --git a/src/gprs/gtphub.c b/src/gprs/gtphub.c index 4ee20cd..ca5857b 100644 --- a/src/gprs/gtphub.c +++ b/src/gprs/gtphub.c @@ -791,7 +791,7 @@ time_t gtphub_now(void) { struct timespec now_tp; - OSMO_ASSERT(clock_gettime(CLOCK_MONOTONIC, &now_tp) >= 0); + OSMO_ASSERT(osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp) >= 0); return now_tp.tv_sec; } diff --git a/src/gprs/sgsn_cdr.c b/src/gprs/sgsn_cdr.c index 7380e74..93ed0af 100644 --- a/src/gprs/sgsn_cdr.c +++ b/src/gprs/sgsn_cdr.c @@ -177,7 +177,7 @@ if (pdp->ggsn) inet_ntop(AF_INET, &pdp->ggsn->gsn->gsnc.s_addr, sgsn_addr, sizeof(sgsn_addr)); - clock_gettime(CLOCK_MONOTONIC, &tp); + osmo_clock_gettime(CLOCK_MONOTONIC, &tp); gettimeofday(&tv, NULL); /* convert the timestamp to UTC */ @@ -267,7 +267,7 @@ cdr_log_mm(inst, "free", signal_data->mm); break; case S_SGSN_PDP_ACT: - clock_gettime(CLOCK_MONOTONIC, &signal_data->pdp->cdr_start); + osmo_clock_gettime(CLOCK_MONOTONIC, &signal_data->pdp->cdr_start); signal_data->pdp->cdr_charging_id = signal_data->pdp->lib->cid; cdr_log_pdp(inst, "pdp-act", signal_data->pdp); osmo_timer_setup(&signal_data->pdp->cdr_timer, cdr_pdp_timeout, -- To view, visit https://gerrit.osmocom.org/10487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic638849c6687c376c4c0c36cc286d499a073d6ca Gerrit-Change-Number: 10487 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:10:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:10:52 +0000 Subject: Change in osmo-bts[master]: fix timespec subtraction in compute_elapsed_us() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10488 ) Change subject: fix timespec subtraction in compute_elapsed_us() ...................................................................... fix timespec subtraction in compute_elapsed_us() The previous implementation unconditionally subtracted nanosecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() instead, which accounts for nanoseconds correctly. This is a similar bug as fixed in osmo-pcu for issue OS#3225 While here, switch variables which are calculated based on struct timespec to 64 bit types. While probably not strictly necessary in practice, this makes the types used in calculations more compatible. Change-Id: Idfd9c807e35cd7fb5c80625b9746121f81c24599 Related: OS#3467 Related: OS#3225 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 11 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 4ab937a..4bac235 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -1409,13 +1410,12 @@ #define TRX_LOSS_FRAMES 400 /*! compute the number of micro-seconds difference elapsed between \a last and \a now */ -static inline int compute_elapsed_us(const struct timespec *last, const struct timespec *now) +static inline int64_t compute_elapsed_us(const struct timespec *last, const struct timespec *now) { - int elapsed; + struct timespec elapsed; - elapsed = (now->tv_sec - last->tv_sec) * 1000000 - + (now->tv_nsec - last->tv_nsec) / 1000; - return elapsed; + timespecsub(now, last, &elapsed); + return (int64_t)(elapsed.tv_sec * 1000000) + (elapsed.tv_nsec / 1000); } /*! compute the number of frame number intervals elapsed between \a last and \a now */ @@ -1508,8 +1508,7 @@ struct osmo_trx_clock_state *tcs = &g_clk_s; struct timespec tv_now; uint64_t expire_count; - int elapsed_us; - int error_us; + int64_t elapsed_us, error_us; int rc, i; if (!(what & BSC_FD_READ)) @@ -1537,14 +1536,14 @@ elapsed_us = compute_elapsed_us(&tcs->last_fn_timer.tv, &tv_now); error_us = elapsed_us - FRAME_DURATION_uS; #ifdef DEBUG_CLOCK - printf("%s(): %09ld, elapsed_us=%05d, error_us=%-d: fn=%d\n", __func__, + printf("%s(): %09ld, elapsed_us=%05" PRId64 ", error_us=%-d: fn=%d\n", __func__, tv_now.tv_nsec, elapsed_us, error_us, tcs->last_fn_timer.fn+1); #endif tcs->last_fn_timer.tv = tv_now; /* if someone played with clock, or if the process stalled */ if (elapsed_us > FRAME_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) { - LOGP(DL1C, LOGL_ERROR, "PC clock skew: elapsed_us=%d, error_us=%d\n", + LOGP(DL1C, LOGL_ERROR, "PC clock skew: elapsed_us=%" PRId64 ", error_us=%" PRId64 "\n", elapsed_us, error_us); goto no_clock; } @@ -1591,8 +1590,8 @@ { struct osmo_trx_clock_state *tcs = &g_clk_s; struct timespec tv_now; - int elapsed_us, elapsed_fn; - int64_t elapsed_us_since_clk, elapsed_fn_since_clk, error_us_since_clk; + int elapsed_fn; + int64_t elapsed_us, elapsed_us_since_clk, elapsed_fn_since_clk, error_us_since_clk; unsigned int fn_caught_up = 0; const struct timespec interval = { .tv_sec = 0, .tv_nsec = FRAME_DURATION_nS }; @@ -1655,7 +1654,7 @@ return trx_setup_clock(bts, tcs, &tv_now, &interval, fn); } - LOGP(DL1C, LOGL_INFO, "GSM clock jitter: %d us (elapsed_fn=%d)\n", + LOGP(DL1C, LOGL_INFO, "GSM clock jitter: %" PRId64 "us (elapsed_fn=%d)\n", elapsed_fn * FRAME_DURATION_uS - elapsed_us, elapsed_fn); /* too many frames have been processed already */ -- To view, visit https://gerrit.osmocom.org/10488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idfd9c807e35cd7fb5c80625b9746121f81c24599 Gerrit-Change-Number: 10488 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:13:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 14:13:25 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add VTY parameter: link stored-msgs-max-length In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10477 ) Change subject: gbproxy: Add VTY parameter: link stored-msgs-max-length ...................................................................... gbproxy: Add VTY parameter: link stored-msgs-max-length It was discovered in some prod setups that some TLLIs can maintain quite long queues of msgb in case its IMSI is not acquired and the tlli is not pruned due to link-list max-{age,length} being set to 0. As a result, the osmo-gpbroxy steadly increases the list size of maintained TLLIs, and some TLLI was found without IMSI catching already 1211 msgb. Let's allow setting a maxiumum length for the queue storing those msgb in a per TLLI base. If the limit is reached, oldest msgb are removed before adding a new one. Depends: libosmocore Change-Id I33b501e89a8f29e4aa121696bcbb13d4b83db40f Related: SYS#4297 Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 --- M include/osmocom/sgsn/gb_proxy.h M src/gprs/gb_proxy.c M src/gprs/gb_proxy_vty.c 3 files changed, 59 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 70de3d7..16082fc 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -105,8 +105,12 @@ struct osmo_plmn_id core_plmn; uint8_t* core_apn; size_t core_apn_size; + /* If !0, Max age to consider a struct gbproxy_link_info as stale */ int tlli_max_age; + /* If !0, Max len of gbproxy_peer->list (list of struct gbproxy_link_info) */ int tlli_max_len; + /* If !0, Max len of gbproxy_link_info->stored_msgs (list of msgb) */ + uint32_t stored_msgs_max_len; /* Experimental config */ int patch_ptmsi; @@ -171,6 +175,7 @@ int imsi_acq_pending; struct llist_head stored_msgs; + uint32_t stored_msgs_len; unsigned vu_gen_tx_bss; int is_deregistered; diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index f834ed3..8bb6789 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -338,7 +338,8 @@ msgb_nsei(msg)); /* Patch and flush stored messages towards the SGSN */ - while ((stored_msg = msgb_dequeue(&link_info->stored_msgs))) { + while ((stored_msg = msgb_dequeue_count(&link_info->stored_msgs, + &link_info->stored_msgs_len))) { struct gprs_gb_parse_context tmp_parse_ctx = {0}; tmp_parse_ctx.to_bss = 0; tmp_parse_ctx.peer_nsei = msgb_nsei(stored_msg); @@ -492,6 +493,24 @@ /* The message cannot be processed since the IMSI is still missing */ + /* If queue is getting too large, drop oldest msgb before adding new one */ + if (peer->cfg->stored_msgs_max_len > 0) { + int exceeded_max_len = link_info->stored_msgs_len + + 1 - peer->cfg->stored_msgs_max_len; + + for (; exceeded_max_len > 0; exceeded_max_len--) { + struct msgb *msgb_drop; + msgb_drop = msgb_dequeue_count(&link_info->stored_msgs, + &link_info->stored_msgs_len); + LOGP(DLLC, LOGL_INFO, + "NSEI=%d(BSS) Dropping stored msgb from list " + "(!acq imsi, length %d, max_len exceeded)\n", + msgb_nsei(msgb_drop), link_info->stored_msgs_len); + + msgb_free(msgb_drop); + } + } + /* Enqueue unpatched messages */ LOGP(DLLC, LOGL_INFO, "NSEI=%d(BSS) IMSI acquisition in progress, " @@ -500,7 +519,8 @@ parse_ctx->llc_msg_name ? parse_ctx->llc_msg_name : "BSSGP"); stored_msg = bssgp_msgb_copy(msg, "process_bssgp_ul"); - msgb_enqueue(&link_info->stored_msgs, stored_msg); + msgb_enqueue_count(&link_info->stored_msgs, stored_msg, + &link_info->stored_msgs_len); if (!link_info->imsi_acq_pending) { LOGP(DLLC, LOGL_INFO, diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c index cd10abf..d743355 100644 --- a/src/gprs/gb_proxy_vty.c +++ b/src/gprs/gb_proxy_vty.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -128,6 +129,9 @@ vty_out(vty, " link-list keep-mode %s%s", get_value_string(keep_modes, g_cfg->keep_link_infos), VTY_NEWLINE); + if (g_cfg->stored_msgs_max_len > 0) + vty_out(vty, " link stored-msgs-max-length %"PRIu32"%s", + g_cfg->stored_msgs_max_len, VTY_NEWLINE); return CMD_SUCCESS; @@ -402,6 +406,7 @@ } #define GBPROXY_LINK_LIST_STR "Set TLLI list parameters\n" +#define GBPROXY_LINK_STR "Set TLLI parameters\n" #define GBPROXY_MAX_AGE_STR "Limit maximum age\n" DEFUN(cfg_gbproxy_link_list_max_age, @@ -464,6 +469,27 @@ return CMD_SUCCESS; } +DEFUN(cfg_gbproxy_link_stored_msgs_max_len, + cfg_gbproxy_link_stored_msgs_max_len_cmd, + "link stored-msgs-max-length <1-99999>", + GBPROXY_LINK_STR GBPROXY_MAX_LEN_STR + "Maximum number of msgb stored in the logical link waiting to acquire its IMSI\n") +{ + g_cfg->stored_msgs_max_len = (uint32_t) atoi(argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(cfg_gbproxy_link_no_stored_msgs_max_len, + cfg_gbproxy_link_no_stored_msgs_max_len_cmd, + "no link stored-msgs-max-length", + NO_STR GBPROXY_LINK_STR GBPROXY_MAX_LEN_STR) +{ + g_cfg->stored_msgs_max_len = 0; + + return CMD_SUCCESS; +} + DEFUN(show_gbproxy, show_gbproxy_cmd, "show gbproxy [stats]", SHOW_STR "Display information about the Gb proxy\n" "Show statistics\n") @@ -502,10 +528,6 @@ llist_for_each_entry(link_info, &state->logical_links, list) { time_t age = now - link_info->timestamp; - int stored_msgs = 0; - struct llist_head *iter; - llist_for_each(iter, &link_info->stored_msgs) - stored_msgs++; if (link_info->imsi > 0) { snprintf(mi_buf, sizeof(mi_buf), "(invalid)"); @@ -518,8 +540,10 @@ vty_out(vty, " TLLI %08x, IMSI %s, AGE %d", link_info->tlli.current, mi_buf, (int)age); - if (stored_msgs) - vty_out(vty, ", STORED %d", stored_msgs); + if (link_info->stored_msgs_len) + vty_out(vty, ", STORED %"PRIu32"/%"PRIu32, + link_info->stored_msgs_len, + g_cfg->stored_msgs_max_len); if (g_cfg->route_to_sgsn2) vty_out(vty, ", SGSN NSEI %d", @@ -825,6 +849,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_keep_mode_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_stored_msgs_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_core_mcc_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_core_mnc_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_match_imsi_cmd); @@ -834,6 +859,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_no_acquire_imsi_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_len_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_no_stored_msgs_max_len_cmd); /* broken or deprecated to allow an upgrade path */ install_element(GBPROXY_NODE, &cfg_gbproxy_broken_apn_match_cmd); -- To view, visit https://gerrit.osmocom.org/10477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4473be8604f80302df03ffdd5a13280dc072f824 Gerrit-Change-Number: 10477 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:15:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 17 Aug 2018 14:15:19 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c File src/host/trxcon/sched_clck.c: https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 98 PS1, Line 98: > I would avoid passing a negative value in there. [?] Does this have to be changed as part of this patch? I'd rather treat it as a separate issue. https://gerrit.osmocom.org/#/c/10489/2/src/host/trxcon/sched_clck.c File src/host/trxcon/sched_clck.c: https://gerrit.osmocom.org/#/c/10489/2/src/host/trxcon/sched_clck.c at 173 PS2, Line 173: while (duration.tv_nsec >= 1000000000) { > What about something like this to avoid a loop? [?] Nice, I like it. Thanks for this suggestion. -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 14:15:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:15:26 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 17 Aug 2018 14:15:26 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10489 to look at the new patch set (#3). Change subject: fix time delta calculations in sched_clck.c ...................................................................... fix time delta calculations in sched_clck.c Use osmo_clock_gettime() to read the monotonic clock instead of gettimeofday() which could drift backwards. This requires switching the scheduler clock from struct timeval to struct timespec. Expand some variables to 64 bits in order to keep types used in calculations compatible. The previous implementation unconditionally subtracted microsecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() for the subtraction instead which accounts for fractions of a second correctly. Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Related: OS#3467 --- M src/host/trxcon/sched_clck.c M src/host/trxcon/scheduler.h 2 files changed, 31 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/10489/3 -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:20:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 14:20:30 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c File src/host/trxcon/sched_clck.c: https://gerrit.osmocom.org/#/c/10489/1/src/host/trxcon/sched_clck.c at 98 PS1, Line 98: FRAME_DURATION_uS - elapsed_us); > Does this have to be changed as part of this patch? I'd rather treat it as a separate issue. No it doesn't, I'm just saying "please if possible have a look at this at some point" :D -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 14:20:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:22:30 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 17 Aug 2018 14:22:30 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 7 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 17 Aug 2018 14:22:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 17 Aug 2018 14:25:38 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, Holger Freyther, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9271 to look at the new patch set (#8). Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Implement MNCC Cause <-> SIP Call Error mapping This is work in progress, comments? Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 --- M src/call.h M src/mncc.c M src/sip.c 3 files changed, 82 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/71/9271/8 -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:25:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 14:25:43 +0000 Subject: Change in osmocom-bb[master]: fix time delta calculations in sched_clck.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: fix time delta calculations in sched_clck.c ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 17 Aug 2018 14:25:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:29:51 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 17 Aug 2018 14:29:51 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Patch Set 8: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/9271/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9271/8/src/mncc.c at 145 PS8, Line 145: __func__, osmo_mncc_name(msg_type), mncc.cause.value); It would be nice to see a human readable cause here. https://gerrit.osmocom.org/#/c/9271/8/src/mncc.c at 393 PS8, Line 393: struct in_addr net = { .s_addr = ntohl(leg->base.ip) }; I should move this to another commit. https://gerrit.osmocom.org/#/c/9271/8/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/9271/8/src/sip.c at 181 PS8, Line 181: case 404: We don't have any constants for a sip status anywhere. https://gerrit.osmocom.org/#/c/9271/8/src/sip.c at 265 PS8, Line 265: switch (_leg->cause) { Is this OK here like this, or should one create a separate function? -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 17 Aug 2018 14:29:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:33:09 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 17 Aug 2018 14:33:09 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/9271/8/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9271/8/src/mncc.c at 517 PS8, Line 517: LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %d\n", data->cause.value); In fact, I should move all the logging related patches to another commit. -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 8 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 17 Aug 2018 14:33:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:43:36 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 17 Aug 2018 14:43:36 +0000 Subject: Change in osmo-sip-connector[master]: Logging: in check_rtp_create() log the IP address in human readable d... Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10490 Change subject: Logging: in check_rtp_create() log the IP address in human readable dotted quad format. ...................................................................... Logging: in check_rtp_create() log the IP address in human readable dotted quad format. Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 --- M src/mncc.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/90/10490/1 diff --git a/src/mncc.c b/src/mncc.c index b2c4abb..d60f4e4 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -380,9 +380,10 @@ leg->base.payload_msg_type = rtp->payload_msg_type; /* TODO.. now we can continue with the call */ + struct in_addr net = { .s_addr = ntohl(leg->base.ip) }; LOGP(DMNCC, LOGL_DEBUG, - "RTP cnt leg(%u) ip(%u), port(%u) pt(%u) ptm(%u)\n", - leg->callref, leg->base.ip, leg->base.port, + "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", + leg->callref, inet_ntoa(net), leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); stop_cmd_timer(leg, MNCC_RTP_CREATE); continue_call(leg); -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:54:27 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Aug 2018 14:54:27 +0000 Subject: Change in osmo-bts[master]: cosmetic: unify measurement sample handling in one function Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10491 Change subject: cosmetic: unify measurement sample handling in one function ...................................................................... cosmetic: unify measurement sample handling in one function In l1sap.c we call lchan_new_ul_meas() and lchan_meas_check_compute() directly in sequence. Lets unify thos two steps inside measurement.c so that we only need to call one function from l1sap.c. Change-Id: If48bc7442dfaab8c36b93949f741de6e836e792a Related: OS#2975 --- M include/osmo-bts/measurement.h M src/common/l1sap.c M src/common/measurement.c 3 files changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/10491/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index e32c8e8..283b0ff 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -8,4 +8,6 @@ int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn); +void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); + #endif diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 8936674..00ead8d 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -528,11 +528,7 @@ /* we assume that symbol period is 1 bit: */ set_ms_to_data(lchan, info_meas_ind->ta_offs_256bits / 256, true); - lchan_new_ul_meas(lchan, &ulm, info_meas_ind->fn); - - /* Check measurement period end and prepare the UL measurment - * report at Meas period End*/ - lchan_meas_check_compute(lchan, info_meas_ind->fn); + lchan_meas_process_measurement(lchan, &ulm, info_meas_ind->fn); return 0; } diff --git a/src/common/measurement.c b/src/common/measurement.c index 01f1e5d..a75b54d 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -477,3 +477,16 @@ return 1; } + +/* Process a single uplink measurement sample. This function is called from + * l1sap.c every time a measurement indication is received. It collects the + * measurement samples and automatically detects the end oft the measurement + * interval. */ +void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) +{ + lchan_new_ul_meas(lchan, ulm, fn); + + /* Check measurement period end and prepare the UL + * measurment report at Meas period End */ + lchan_meas_check_compute(lchan, fn); +} -- To view, visit https://gerrit.osmocom.org/10491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If48bc7442dfaab8c36b93949f741de6e836e792a Gerrit-Change-Number: 10491 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 14:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 17 Aug 2018 14:54:28 +0000 Subject: Change in osmo-bts[master]: measurement: make sure measurement interval end is detected Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10492 Change subject: measurement: make sure measurement interval end is detected ...................................................................... measurement: make sure measurement interval end is detected the measurement interval end is detected by using the measurement indication that is related to the SACCH block as a trigger to start the computation. If the measurement indication for the SACCH gets lost because the block could not be received then the processing is not executed. This may cause wrong results or when it happens condecutively an overflow of the measurement sample buffer. - Store the frame number of the last received measurement indication - Use the stored frame number to check if an interval was crossed when the next measurement indication is received. If we detect that we missed the interval, catch up by running the computation and start the next interval. Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Related: OS#2975 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 5 files changed, 881 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/10492/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index baa0145..c460ea0 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -260,6 +260,8 @@ uint8_t l1_info[2]; struct gsm_meas_rep_unidir ul_res; int16_t ms_toa256; + /* Frame number of the last mesaurement indication receceived */ + uint32_t last_fn; /* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */ struct { /* minimum value of toa256 during measurement period */ diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 283b0ff..30b244b 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -10,4 +10,6 @@ void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); +bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn); + #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index a75b54d..061608b 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -271,7 +271,32 @@ return rc; } -/* receive a L1 uplink measurement from L1 */ +/* Check if a measurement period is overdue. This situation may occur when the + * SACCH frame that closes the measurement interval was not received. Then the + * end of the measurement will not be detected. Using this function we can + * detect if we missed a measurement period end and we also find the frame + * number of the lost SACCH frame. (this function is only used internally, + * it is public to call it from unit-tests) */ +bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn) +{ + unsigned int i; + unsigned int distance; + + distance = abs(fn - lchan->meas.last_fn); + for (i = 1; i < distance; i++) { + if (is_meas_complete(lchan, i + lchan->meas.last_fn)) { + *fn_missed_end = i + lchan->meas.last_fn; + return true; + } + } + + /* No missed interval ends - everything ok */ + *fn_missed_end = 0; + return false; +} + +/* receive a L1 uplink measurement from L1 (this function is only used + * internally, it is public to call it from unit-tests) */ int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { if (lchan->state != LCHAN_S_ACTIVE) { @@ -299,6 +324,8 @@ memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm, sizeof(*ulm)); + lchan->meas.last_fn = fn; + return 0; } @@ -484,9 +511,29 @@ * interval. */ void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { - lchan_new_ul_meas(lchan, ulm, fn); + uint32_t fn_missed_end; + bool missed_end; - /* Check measurement period end and prepare the UL - * measurment report at Meas period End */ - lchan_meas_check_compute(lchan, fn); + /* The measurement processing detects the end of a measurement period + * by checking if the received measurement sample is from a SACCH + * block. If so, then the measurement computation is performed and the + * next cycle starts. However, when the SACCH block is not received + * then the associated measurement indication is also skipped. Because + * of this we must check now if the measurement interval ended between + * the last and the current call of this function */ + missed_end = is_meas_overdue(lchan, &fn_missed_end, fn); + + if (missed_end) { + DEBUGPFN(DMEAS, fn, "%s measurement interval ending missed, catching up...\n", gsm_lchan_name(lchan)); + /* We missed the end of the interval. Do the computation now + * and add the uplink measurement we got as the first sample + * of a new interval */ + lchan_meas_check_compute(lchan, fn_missed_end); + lchan_new_ul_meas(lchan, ulm, fn); + } else { + /* This is the normal case, we first add the measurement sample + * to the current interva and run the check+computation */ + lchan_new_ul_meas(lchan, ulm, fn); + lchan_meas_check_compute(lchan, fn); + } } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 2ba44d3..734ca89 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -117,6 +117,342 @@ } +/* This tests the function is_meas_overdue() and since is_meas_overdue() + * internally makes use of is_meas_complete(), this also gives + * is_meas_complete() a detailed check. */ +static void test_is_meas_overdue(void) +{ + struct gsm_lchan *lchan; + bool rc; + uint32_t fn_missed_end; + unsigned int i; + + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing is_meas_overdue() and is_meas_complete()\n"); + + /* Missing period-end-trigger at fn=12, TCH/F, TS0 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17 + 104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 12 + 104); + + /* Missing period-end-trigger at fn=12, TCH/H, TS0 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17 + 104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 12 + 104); + + /* Missing period-end-trigger at fn=12, TCH/H, TS1 */ + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17 + 104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 12 + 104); + + /* Missing period-end-trigger at fn=25, TCH/F, TS1 */ + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 25); + + /* Missing period-end-trigger at fn=25, TCH/H, TS1 */ + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 25); + + /* Missing period-end-trigger at fn=25, TCH/H, TS1 */ + lchan = &trx->ts[1].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 25); + + /* Missing period-end-trigger at fn=38, TCH/F, TS2 */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38); + + /* Missing period-end-trigger at fn=38, TCH/H, TS2 */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38); + + /* Missing period-end-trigger at fn=38, TCH/H, TS2 */ + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38); + + /* Missing period-end-trigger at fn=51, TCH/F, TS3 */ + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 51); + + /* Missing period-end-trigger at fn=51, TCH/H, TS3 */ + lchan = &trx->ts[2].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 51); + + /* Missing period-end-trigger at fn=51, TCH/H, TS3 */ + lchan = &trx->ts[3].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 51); + + /* Missing period-end-trigger at fn=64, TCH/F, TS4 */ + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 64); + + /* Missing period-end-trigger at fn=64, TCH/H, TS4 */ + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 64); + + /* Missing period-end-trigger at fn=64, TCH/H, TS4 */ + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 64); + + /* Missing period-end-trigger at fn=77, TCH/F, TS5 */ + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 77); + + /* Missing period-end-trigger at fn=77, TCH/H, TS5 */ + lchan = &trx->ts[4].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 77); + + /* Missing period-end-trigger at fn=77, TCH/H, TS5 */ + lchan = &trx->ts[5].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 77); + + /* Missing period-end-trigger at fn=90, TCH/F, TS6 */ + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 90); + + /* Missing period-end-trigger at fn=90, TCH/F, TS6 */ + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 90); + + /* Missing period-end-trigger at fn=90, TCH/F, TS6 */ + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 90); + + /* Missing period-end-trigger at fn=103, TCH/F, TS7 */ + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 103); + + /* Missing period-end-trigger at fn=103, TCH/F, TS7 */ + lchan = &trx->ts[6].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 103); + + /* Missing period-end-trigger at fn=103, TCH/F, TS7 */ + lchan = &trx->ts[7].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 103); + + /* Dropout inside the interval, no period-end-trigger missed */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 56; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == 0); + + /* No dropout, but right after period-end-trigger */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 38; + rc = is_meas_overdue(lchan, &fn_missed_end, 39); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == 0); + + /* No dropout, two neigbouring frames at random position + * (should not happen in the real world) */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 43; + rc = is_meas_overdue(lchan, &fn_missed_end, 44); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == 0); + + /* No dropout, Two neigbouring frames (period end, right side) */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 38; + rc = is_meas_overdue(lchan, &fn_missed_end, 39); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == 0); + + /* No dropout, Two neigbouring frames (period end, left side, + * should not happen in the real world) */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 37; + rc = is_meas_overdue(lchan, &fn_missed_end, 38); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == 0); + + /* No dropout, test directly on a the trigger frame */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 38); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == 0); + + /* No dropout, previous frame is trigger frame + * (should not happen in the real world) */ + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 38; + rc = is_meas_overdue(lchan, &fn_missed_end, 38); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == 0); + + /* Missing period-end-trigger at fn=38+i*104, TCH/F, TS2 to + * see the modulus is correct. */ + for (i = 0; i < 100; i++) { + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 34 + 104 * 1; + rc = is_meas_overdue(lchan, &fn_missed_end, 43 + 104 * 1); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38 + 104 * 1); + } +} + +/* This tests the robustness of lchan_meas_process_measurement(). This is the + * function that is called from l1_sap.c each time a measurement indication is + * received. The process must still go on when measurement indications (blocks) + * are lost or otherwise spaced out. Even the complete absence of the + * measurement indications from the SACCH which are used to detect the interval + * end must not keep the interval from beeing processed. */ +void test_lchan_meas_process_measurement(bool no_sacch, bool dropouts) +{ + struct gsm_lchan *lchan = &trx->ts[2].lchan[0]; + unsigned int i; + unsigned int k = 0; + unsigned int fn = 0; + struct bts_ul_meas ulm; + + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing lchan_meas_process_measurement()\n"); + if (no_sacch) + printf(" * SACCH blocks not generated.\n"); + if (dropouts) + printf + (" * Simulate dropouts by leaving out every 4th measurement\n"); + + ulm.ber10k = 0; + ulm.ta_offs_256bits = 256; + ulm.c_i = 0; + ulm.is_sub = 0; + ulm.inv_rssi = 90; + + lchan->ts->pchan = GSM_PCHAN_TCH_F; + reset_lchan_meas(lchan); + + /* feed uplink measurements into the code */ + for (i = 0; i < 100; i++) { + + if (dropouts == false || i % 4) + lchan_meas_process_measurement(lchan, &ulm, fn); + else + printf + ("(leaving out measurement sample for frame number %u)\n", + fn); + + fn += 4; + if (k == 2) { + fn++; + k = 0; + } else + k++; + + if (fn % 104 == 39 && no_sacch == false) { + printf + ("(now adding measurement sample for SACCH block)\n"); + lchan_meas_process_measurement(lchan, &ulm, fn - 1); + } else + printf + ("(leaving out measurement sample for SACCH block)\n"); + } +} + int main(int argc, char **argv) { void *tall_bts_ctx; @@ -172,6 +508,17 @@ test_meas_compute(&mtc4); test_meas_compute(&mtc5); + printf("\n"); + printf("***************************************************\n"); + printf("*** MEASUREMENT INTERVAL ENDING DETECTION TESTS ***\n"); + printf("***************************************************\n"); + + test_is_meas_overdue(); + test_lchan_meas_process_measurement(false, false); + test_lchan_meas_process_measurement(true, false); + test_lchan_meas_process_measurement(false, true); + test_lchan_meas_process_measurement(true, true); + printf("Success\n"); return 0; diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 026899d..77b652e 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -573,4 +573,482 @@ meas.ext.toa256_std_dev | 0 | 0 meas.ul_res.full.rx_lev | 20 | 20 meas.ul_res.full.rx_qual | 0 | 0 + +*************************************************** +*** MEASUREMENT INTERVAL ENDING DETECTION TESTS *** +*************************************************** + + +=========================================================== +Testing is_meas_overdue() and is_meas_complete() + + +=========================================================== +Testing lchan_meas_process_measurement() +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) + + +=========================================================== +Testing lchan_meas_process_measurement() + * SACCH blocks not generated. +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) + + +=========================================================== +Testing lchan_meas_process_measurement() + * Simulate dropouts by leaving out every 4th measurement +(leaving out measurement sample for frame number 0) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 17) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 34) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 52) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 69) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 86) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 104) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 121) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 138) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 156) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 173) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 190) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 208) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 225) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 242) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 260) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 277) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 294) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 312) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 329) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 346) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 364) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 381) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 398) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 416) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) + + +=========================================================== +Testing lchan_meas_process_measurement() + * SACCH blocks not generated. + * Simulate dropouts by leaving out every 4th measurement +(leaving out measurement sample for frame number 0) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 17) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 34) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 52) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 69) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 86) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 104) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 121) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 138) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 156) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 173) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 190) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 208) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 225) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 242) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 260) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 277) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 294) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 312) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 329) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 346) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 364) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 381) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 398) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 416) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) Success -- To view, visit https://gerrit.osmocom.org/10492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Gerrit-Change-Number: 10492 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 17 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 17 Aug 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#218?= In-Reply-To: <359752082.8.1534432207776.JavaMail.jenkins@jenkins.osmocom.org> References: <359752082.8.1534432207776.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1459666544.20.1534518607761.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Aug 17 15:17:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 15:17:10 +0000 Subject: Change in osmo-trx[master]: configure.ac: Fix typo in with-lms help string Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10493 Change subject: configure.ac: Fix typo in with-lms help string ...................................................................... configure.ac: Fix typo in with-lms help string Change-Id: I7777d027fffa50dddf3f0a3c0bf2173aa8497be3 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/93/10493/1 diff --git a/configure.ac b/configure.ac index 974a611..cc099d2 100644 --- a/configure.ac +++ b/configure.ac @@ -102,7 +102,7 @@ AC_ARG_WITH(lms, [ AS_HELP_STRING([--with-lms], - [enable LimeSuite gnuradio based transceiver]) + [enable LimeSuite based transceiver]) ]) AC_ARG_WITH(singledb, [ -- To view, visit https://gerrit.osmocom.org/10493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7777d027fffa50dddf3f0a3c0bf2173aa8497be3 Gerrit-Change-Number: 10493 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 15:54:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 15:54:24 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10486 ) Change subject: gbproxy: Add new VTY-managed timer: link-list clean-stale-timer ...................................................................... gbproxy: Add new VTY-managed timer: link-list clean-stale-timer This timer allows periodically cleaning up stale links in link-list of each gbproxy_peer. Previous to this patch, this kind of cleanup (gbproxy_remove_stale_link_infos) was being done only as a consequence of external events being triggered, such as a message from that peer being received. It was found in a production network agreggating several BSS that some of them were offline for a longtime but gbproxy was still caching big amounts of really old link_info for the NSEI assigned to those BSS, because since they were probably turned off abruptely, no new messages were received from it which would trigger the cleanup. As a consequence, it has been observed that a timer to periodically clean up old entries (link-list max-age) is requird in case w don't receive messages from that NSEI periodically. Related: SYS#4431 Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a --- M include/osmocom/sgsn/gb_proxy.h M src/gprs/gb_proxy_peer.c M src/gprs/gb_proxy_vty.c 3 files changed, 67 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index 16082fc..7e2ae42 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -105,6 +105,8 @@ struct osmo_plmn_id core_plmn; uint8_t* core_apn; size_t core_apn_size; + /* Frequency (sec) at which timer to clean stale links is fired (0 disabled) */ + unsigned int clean_stale_timer_freq; /* If !0, Max age to consider a struct gbproxy_link_info as stale */ int tlli_max_age; /* If !0, Max len of gbproxy_peer->list (list of struct gbproxy_link_info) */ @@ -151,6 +153,9 @@ struct rate_ctr_group *ctrg; struct gbproxy_patch_state patch_state; + + /* Fired periodically to clean up stale links from list */ + struct osmo_timer_list clean_stale_timer; }; struct gbproxy_tlli_state { diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c index f2cdd93..8e28fc4 100644 --- a/src/gprs/gb_proxy_peer.c +++ b/src/gprs/gb_proxy_peer.c @@ -167,6 +167,19 @@ return NULL; } +static void clean_stale_timer_cb(void *data) +{ + time_t now; + struct timespec ts = {0,}; + struct gbproxy_peer *peer = (struct gbproxy_peer *) data; + + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); + now = ts.tv_sec; + gbproxy_remove_stale_link_infos(peer, now); + if (peer->cfg->clean_stale_timer_freq != 0) + osmo_timer_schedule(&peer->clean_stale_timer, + peer->cfg->clean_stale_timer_freq, 0); +} struct gbproxy_peer *gbproxy_peer_alloc(struct gbproxy_config *cfg, uint16_t bvci) { @@ -188,13 +201,18 @@ INIT_LLIST_HEAD(&peer->patch_state.logical_links); + osmo_timer_setup(&peer->clean_stale_timer, clean_stale_timer_cb, peer); + if (peer->cfg->clean_stale_timer_freq != 0) + osmo_timer_schedule(&peer->clean_stale_timer, + peer->cfg->clean_stale_timer_freq, 0); + return peer; } void gbproxy_peer_free(struct gbproxy_peer *peer) { llist_del(&peer->list); - + osmo_timer_del(&peer->clean_stale_timer); gbproxy_delete_link_infos(peer); rate_ctr_group_free(peer->ctrg); @@ -220,4 +238,3 @@ return counter; } - diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c index d743355..52c39fd 100644 --- a/src/gprs/gb_proxy_vty.c +++ b/src/gprs/gb_proxy_vty.c @@ -120,6 +120,9 @@ vty_out(vty, " secondary-sgsn nsei %u%s", g_cfg->nsip_sgsn2_nsei, VTY_NEWLINE); + if (g_cfg->clean_stale_timer_freq > 0) + vty_out(vty, " link-list clean-stale-timer %u%s", + g_cfg->clean_stale_timer_freq, VTY_NEWLINE); if (g_cfg->tlli_max_age > 0) vty_out(vty, " link-list max-age %d%s", g_cfg->tlli_max_age, VTY_NEWLINE); @@ -407,6 +410,44 @@ #define GBPROXY_LINK_LIST_STR "Set TLLI list parameters\n" #define GBPROXY_LINK_STR "Set TLLI parameters\n" + +#define GBPROXY_CLEAN_STALE_TIMER_STR "Periodic timer to clean stale links\n" + +DEFUN(cfg_gbproxy_link_list_clean_stale_timer, + cfg_gbproxy_link_list_clean_stale_timer_cmd, + "link-list clean-stale-timer <1-999999>", + GBPROXY_LINK_LIST_STR GBPROXY_CLEAN_STALE_TIMER_STR + "Frequency at which the periodic timer is fired (in seconds)\n") +{ + struct gbproxy_peer *peer; + g_cfg->clean_stale_timer_freq = (unsigned int) atoi(argv[0]); + + /* Re-schedule running timers soon in case prev frequency was really big + and new frequency is desired to be lower. After initial run, periodic + time is used. Use random() to avoid firing timers for all peers at + the same time */ + llist_for_each_entry(peer, &g_cfg->bts_peers, list) + osmo_timer_schedule(&peer->clean_stale_timer, + random() % 5, random() % 1000000); + + return CMD_SUCCESS; +} + +DEFUN(cfg_gbproxy_link_list_no_clean_stale_timer, + cfg_gbproxy_link_list_no_clean_stale_timer_cmd, + "no link-list clean-stale-timer", + NO_STR GBPROXY_LINK_LIST_STR GBPROXY_CLEAN_STALE_TIMER_STR) + +{ + struct gbproxy_peer *peer; + g_cfg->clean_stale_timer_freq = 0; + + llist_for_each_entry(peer, &g_cfg->bts_peers, list) + osmo_timer_del(&peer->clean_stale_timer); + + return CMD_SUCCESS; +} + #define GBPROXY_MAX_AGE_STR "Limit maximum age\n" DEFUN(cfg_gbproxy_link_list_max_age, @@ -846,6 +887,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_secondary_sgsn_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_patch_ptmsi_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_acquire_imsi_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_clean_stale_timer_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_keep_mode_cmd); @@ -857,6 +899,7 @@ install_element(GBPROXY_NODE, &cfg_gbproxy_no_secondary_sgsn_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_patch_ptmsi_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_no_acquire_imsi_cmd); + install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_clean_stale_timer_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_age_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_list_no_max_len_cmd); install_element(GBPROXY_NODE, &cfg_gbproxy_link_no_stored_msgs_max_len_cmd); -- To view, visit https://gerrit.osmocom.org/10486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic777016f6d4f0e30fb736484774ca46878f17b7a Gerrit-Change-Number: 10486 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:02:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 16:02:40 +0000 Subject: Change in docker-playground[master]: Remove libosmo-legacy-mgcp-dev from all Dockerfile Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10494 Change subject: Remove libosmo-legacy-mgcp-dev from all Dockerfile ...................................................................... Remove libosmo-legacy-mgcp-dev from all Dockerfile Only openbsc.git related programs require it. Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a --- M osmo-bsc-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-sip-master/Dockerfile 3 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/10494/1 diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 5af6abf..c36fe66 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -20,7 +20,6 @@ libosmo-sccp-dev \ libosmo-sigtran-dev \ libosmo-mgcp-client-dev \ - libosmo-legacy-mgcp-dev \ libgtp-dev && \ apt-get clean diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 19de3a1..3ecbb2a 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -17,7 +17,6 @@ libdbd-sqlite3 \ libdbi-dev \ libosmo-abis-dev \ - libosmo-legacy-mgcp-dev \ libosmo-mgcp-client-dev \ libosmo-gsup-client-dev \ libosmo-netif-dev \ diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index fad4293..55a984c 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -17,7 +17,6 @@ libdbd-sqlite3 \ libdbi-dev \ libosmo-abis-dev \ - libosmo-legacy-mgcp-dev \ libosmo-mgcp-client-dev \ libosmo-netif-dev \ libosmo-ranap-dev \ -- To view, visit https://gerrit.osmocom.org/10494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a Gerrit-Change-Number: 10494 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:05:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:05:08 +0000 Subject: Change in docker-playground[master]: Remove libosmo-legacy-mgcp-dev from all Dockerfile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10494 ) Change subject: Remove libosmo-legacy-mgcp-dev from all Dockerfile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a Gerrit-Change-Number: 10494 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 16:05:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:05:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:05:11 +0000 Subject: Change in docker-playground[master]: Remove libosmo-legacy-mgcp-dev from all Dockerfile In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10494 ) Change subject: Remove libosmo-legacy-mgcp-dev from all Dockerfile ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a Gerrit-Change-Number: 10494 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 16:05:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:05:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:05:13 +0000 Subject: Change in docker-playground[master]: Remove libosmo-legacy-mgcp-dev from all Dockerfile In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10494 ) Change subject: Remove libosmo-legacy-mgcp-dev from all Dockerfile ...................................................................... Remove libosmo-legacy-mgcp-dev from all Dockerfile Only openbsc.git related programs require it. Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a --- M osmo-bsc-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-sip-master/Dockerfile 3 files changed, 0 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 5af6abf..c36fe66 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -20,7 +20,6 @@ libosmo-sccp-dev \ libosmo-sigtran-dev \ libosmo-mgcp-client-dev \ - libosmo-legacy-mgcp-dev \ libgtp-dev && \ apt-get clean diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 19de3a1..3ecbb2a 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -17,7 +17,6 @@ libdbd-sqlite3 \ libdbi-dev \ libosmo-abis-dev \ - libosmo-legacy-mgcp-dev \ libosmo-mgcp-client-dev \ libosmo-gsup-client-dev \ libosmo-netif-dev \ diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index fad4293..55a984c 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -17,7 +17,6 @@ libdbd-sqlite3 \ libdbi-dev \ libosmo-abis-dev \ - libosmo-legacy-mgcp-dev \ libosmo-mgcp-client-dev \ libosmo-netif-dev \ libosmo-ranap-dev \ -- To view, visit https://gerrit.osmocom.org/10494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic641e71e45c5fbd174505116fa45a74e27dad81a Gerrit-Change-Number: 10494 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:05:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:05:26 +0000 Subject: Change in osmo-trx[master]: configure.ac: Fix typo in with-lms help string In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10493 ) Change subject: configure.ac: Fix typo in with-lms help string ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7777d027fffa50dddf3f0a3c0bf2173aa8497be3 Gerrit-Change-Number: 10493 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 16:05:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:05:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:05:27 +0000 Subject: Change in osmo-trx[master]: configure.ac: Fix typo in with-lms help string In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10493 ) Change subject: configure.ac: Fix typo in with-lms help string ...................................................................... configure.ac: Fix typo in with-lms help string Change-Id: I7777d027fffa50dddf3f0a3c0bf2173aa8497be3 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 974a611..cc099d2 100644 --- a/configure.ac +++ b/configure.ac @@ -102,7 +102,7 @@ AC_ARG_WITH(lms, [ AS_HELP_STRING([--with-lms], - [enable LimeSuite gnuradio based transceiver]) + [enable LimeSuite based transceiver]) ]) AC_ARG_WITH(singledb, [ -- To view, visit https://gerrit.osmocom.org/10493 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7777d027fffa50dddf3f0a3c0bf2173aa8497be3 Gerrit-Change-Number: 10493 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:07:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:07:19 +0000 Subject: Change in osmo-sip-connector[master]: Logging: in check_rtp_create() log the IP address in human readable d... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10490 ) Change subject: Logging: in check_rtp_create() log the IP address in human readable dotted quad format. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10490/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/10490/1/src/mncc.c at 386 PS1, Line 386: inet_ntoa(net) inet_ntoa is specified as being used with ip addresses in *network byte order*. Above you appear to be converting it from netowrk to host byte order (ntohl)? -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 16:07:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:08:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:08:03 +0000 Subject: Change in osmo-bts[master]: cosmetic: unify measurement sample handling in one function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10491 ) Change subject: cosmetic: unify measurement sample handling in one function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If48bc7442dfaab8c36b93949f741de6e836e792a Gerrit-Change-Number: 10491 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 16:08:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:20:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 16:20:57 +0000 Subject: Change in osmo-mgw[master]: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10495 Change subject: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp ...................................................................... Remove libosmo-legacy-mgcp and osmo-bsc-mgcp They are only used by openbsc.git programs and belong there. Change-Id: Id31bef052d3f9b8aada1824d6f7f995ebd39bbfd --- M Makefile.am M README M configure.ac M debian/control M debian/copyright D debian/libosmo-legacy-mgcp-dev.install D debian/libosmo-legacy-mgcp0.install M include/Makefile.am M include/osmocom/Makefile.am D include/osmocom/legacy_mgcp/Makefile.am D include/osmocom/legacy_mgcp/mgcp.h D include/osmocom/legacy_mgcp/mgcp_internal.h D include/osmocom/legacy_mgcp/mgcp_transcode.h D include/osmocom/legacy_mgcp/osmux.h D include/osmocom/legacy_mgcp/vty.h D libosmo-legacy-mgcp.pc.in M src/Makefile.am D src/libosmo-legacy-mgcp/Makefile.am D src/libosmo-legacy-mgcp/g711common.h D src/libosmo-legacy-mgcp/mgcp_common.c D src/libosmo-legacy-mgcp/mgcp_network.c D src/libosmo-legacy-mgcp/mgcp_osmux.c D src/libosmo-legacy-mgcp/mgcp_protocol.c D src/libosmo-legacy-mgcp/mgcp_sdp.c D src/libosmo-legacy-mgcp/mgcp_transcode.c D src/libosmo-legacy-mgcp/mgcp_vty.c D src/osmo-bsc_mgcp/Makefile.am D src/osmo-bsc_mgcp/mgcp_main.c M tests/Makefile.am D tests/legacy_mgcp/Makefile.am D tests/legacy_mgcp/mgcp_test.c D tests/legacy_mgcp/mgcp_test.ok D tests/legacy_mgcp/mgcp_transcoding_test.c D tests/legacy_mgcp/mgcp_transcoding_test.ok 34 files changed, 0 insertions(+), 10,541 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/10495/1 -- To view, visit https://gerrit.osmocom.org/10495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id31bef052d3f9b8aada1824d6f7f995ebd39bbfd Gerrit-Change-Number: 10495 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:23:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 17 Aug 2018 16:23:34 +0000 Subject: Change in osmo-mgw[master]: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10495 to look at the new patch set (#2). Change subject: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp ...................................................................... Remove libosmo-legacy-mgcp and osmo-bsc-mgcp They are only used by openbsc.git programs and belong there. Change-Id: Id31bef052d3f9b8aada1824d6f7f995ebd39bbfd --- M Makefile.am M README M configure.ac M debian/control M debian/copyright D debian/libosmo-legacy-mgcp-dev.install D debian/libosmo-legacy-mgcp0.install M include/Makefile.am M include/osmocom/Makefile.am D include/osmocom/legacy_mgcp/Makefile.am D include/osmocom/legacy_mgcp/mgcp.h D include/osmocom/legacy_mgcp/mgcp_internal.h D include/osmocom/legacy_mgcp/mgcp_transcode.h D include/osmocom/legacy_mgcp/osmux.h D include/osmocom/legacy_mgcp/vty.h D libosmo-legacy-mgcp.pc.in M src/Makefile.am D src/libosmo-legacy-mgcp/Makefile.am D src/libosmo-legacy-mgcp/g711common.h D src/libosmo-legacy-mgcp/mgcp_common.c D src/libosmo-legacy-mgcp/mgcp_network.c D src/libosmo-legacy-mgcp/mgcp_osmux.c D src/libosmo-legacy-mgcp/mgcp_protocol.c D src/libosmo-legacy-mgcp/mgcp_sdp.c D src/libosmo-legacy-mgcp/mgcp_transcode.c D src/libosmo-legacy-mgcp/mgcp_vty.c D src/osmo-bsc_mgcp/Makefile.am D src/osmo-bsc_mgcp/mgcp_main.c M tests/Makefile.am D tests/legacy_mgcp/Makefile.am D tests/legacy_mgcp/mgcp_test.c D tests/legacy_mgcp/mgcp_test.ok D tests/legacy_mgcp/mgcp_transcoding_test.c D tests/legacy_mgcp/mgcp_transcoding_test.ok M tests/testsuite.at 35 files changed, 0 insertions(+), 10,554 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/10495/2 -- To view, visit https://gerrit.osmocom.org/10495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id31bef052d3f9b8aada1824d6f7f995ebd39bbfd Gerrit-Change-Number: 10495 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:24:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:24:19 +0000 Subject: Change in osmo-bts[master]: measurement: make sure measurement interval end is detected In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10492 ) Change subject: measurement: make sure measurement interval end is detected ...................................................................... Patch Set 1: Code-Review-1 (6 comments) sorry, there are unfortunately some situations not taken in consideration :( https://gerrit.osmocom.org/#/c/10492/1/include/osmo-bts/gsm_data_shared.h File include/osmo-bts/gsm_data_shared.h: https://gerrit.osmocom.org/#/c/10492/1/include/osmo-bts/gsm_data_shared.h at 263 PS1, Line 263: mesaurement measurement https://gerrit.osmocom.org/#/c/10492/1/include/osmo-bts/gsm_data_shared.h at 264 PS1, Line 264: last_fn I can see you are writing to this field, but I cannot see that you ever reset/reinitialize it after a lchan is closed. https://gerrit.osmocom.org/#/c/10492/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10492/1/src/common/measurement.c at 280 PS1, Line 280: is_meas_overdue what about the start condition? lchan->meas.last_fn will be zero, but the current frame number will be e.g. 200000. Then your current logic would consider a measurement overdue at the very first measurement, as there's a distance of 200000. I think lchan->meas.last_fn needs to be turned into a signed integer and initialized to -1 every time the lchan is reset. This way you can check for -1 here and if that's the case, assume that nothing is overdue. Or you keep it unsigned and use the magic value 0xffffffff as initializer. This is much larger than the largest permitted framenumber. https://gerrit.osmocom.org/#/c/10492/1/src/common/measurement.c at 285 PS1, Line 285: abs(fn - lchan->meas.last_fn) I think you need to do this in modulo-arithmetic of the GSM hyperframe duration. Keep in mind frame numbers wrap at that point, and arithemtically (in "unsigned int" math), without the modulo, your "distance" is way larger than in reality is is (think of last_fn = HYPERFRAME-1 and fn = HYPERFRAME+1. Then the distance is 2, but only in modulo-hyperframe math. Unless I'm wrong, this must be fixed before merge. https://gerrit.osmocom.org/#/c/10492/1/src/common/measurement.c at 286 PS1, Line 286: for (i = 1; i < distance; i++) { : if (is_meas_complete(lchan, i + lchan->meas.last_fn)) { : *fn_missed_end = i + lchan->meas.last_fn; : return true; : } : } this is a potentially quite expensive / time-consuming loop, particularly if the distance is quite large. I wish there was some obvious way to solve this without the expensive and lengthy iteration. If the distance is larger than the sacch reporting interval, it is for sure overdue, So that could be a short-cut, limiting the maximum number of iterations here to 104. That would be a good start. Please add this and a comment as rationale. I think even for distance <= 102/104, it can even be done more efficiently by determining if the end of the measurement period for this lchan (see lookup tables) is within the interval [ lchan->meas.last_fn .. fn ]. So two if statement should be sufficient to avoid the iteration. Feel free to do this optimization as a follow-up patch, to not delay this any further. https://gerrit.osmocom.org/#/c/10492/1/src/common/measurement.c at 294 PS1, Line 294: *fn_missed_end = 0; "0" is a valid frame number like anything else below the value of the maximum hyperframe number. I think setting it to "0" is no different than simply leaving it at whatever random value it was before calling the function. A caller must never use fn_missed_end when this function returns false. -- To view, visit https://gerrit.osmocom.org/10492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Gerrit-Change-Number: 10492 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 17 Aug 2018 16:24:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:24:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:24:26 +0000 Subject: Change in osmo-bts[master]: cosmetic: unify measurement sample handling in one function In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10491 ) Change subject: cosmetic: unify measurement sample handling in one function ...................................................................... cosmetic: unify measurement sample handling in one function In l1sap.c we call lchan_new_ul_meas() and lchan_meas_check_compute() directly in sequence. Lets unify thos two steps inside measurement.c so that we only need to call one function from l1sap.c. Change-Id: If48bc7442dfaab8c36b93949f741de6e836e792a Related: OS#2975 --- M include/osmo-bts/measurement.h M src/common/l1sap.c M src/common/measurement.c 3 files changed, 16 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index e32c8e8..283b0ff 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -8,4 +8,6 @@ int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn); +void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); + #endif diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 8936674..00ead8d 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -528,11 +528,7 @@ /* we assume that symbol period is 1 bit: */ set_ms_to_data(lchan, info_meas_ind->ta_offs_256bits / 256, true); - lchan_new_ul_meas(lchan, &ulm, info_meas_ind->fn); - - /* Check measurement period end and prepare the UL measurment - * report at Meas period End*/ - lchan_meas_check_compute(lchan, info_meas_ind->fn); + lchan_meas_process_measurement(lchan, &ulm, info_meas_ind->fn); return 0; } diff --git a/src/common/measurement.c b/src/common/measurement.c index 01f1e5d..a75b54d 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -477,3 +477,16 @@ return 1; } + +/* Process a single uplink measurement sample. This function is called from + * l1sap.c every time a measurement indication is received. It collects the + * measurement samples and automatically detects the end oft the measurement + * interval. */ +void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) +{ + lchan_new_ul_meas(lchan, ulm, fn); + + /* Check measurement period end and prepare the UL + * measurment report at Meas period End */ + lchan_meas_check_compute(lchan, fn); +} -- To view, visit https://gerrit.osmocom.org/10491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If48bc7442dfaab8c36b93949f741de6e836e792a Gerrit-Change-Number: 10491 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 16:25:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 16:25:29 +0000 Subject: Change in osmo-mgw[master]: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10495 ) Change subject: Remove libosmo-legacy-mgcp and osmo-bsc-mgcp ...................................................................... Patch Set 2: did you verify that there are no code changes to osmo-mgw.git here which did not make it to openbsc.git? I think it's important to verify before removal... -- To view, visit https://gerrit.osmocom.org/10495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id31bef052d3f9b8aada1824d6f7f995ebd39bbfd Gerrit-Change-Number: 10495 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 16:25:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 17:23:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 17 Aug 2018 17:23:05 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_clck.c: fix time delta calculations In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#4) to the change originally created by Stefan Sperling. ( https://gerrit.osmocom.org/10489 ) Change subject: trxcon/sched_clck.c: fix time delta calculations ...................................................................... trxcon/sched_clck.c: fix time delta calculations Use osmo_clock_gettime() to read the monotonic clock instead of gettimeofday() which could drift backwards. This requires switching the scheduler clock from struct timeval to struct timespec. Expand some variables to 64 bits in order to keep types used in calculations compatible. The previous implementation unconditionally subtracted microsecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() for the subtraction instead which accounts for fractions of a second correctly. Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Related: OS#3467 --- M src/host/trxcon/sched_clck.c M src/host/trxcon/scheduler.h 2 files changed, 31 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/10489/4 -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 17:23:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 17 Aug 2018 17:23:46 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_clck.c: fix time delta calculations In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: trxcon/sched_clck.c: fix time delta calculations ...................................................................... Patch Set 4: Code-Review+1 Corrected the commit message a bit, fine for me now :) -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 17 Aug 2018 17:23:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 17:35:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 17 Aug 2018 17:35:53 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_clck.c: fix time delta calculations In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: trxcon/sched_clck.c: fix time delta calculations ...................................................................... Patch Set 4: Verified+1 Also, I can confirm that it doesn't break anything, UL transmission works fine :) -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 17 Aug 2018 17:35:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 17 17:57:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 17 Aug 2018 17:57:48 +0000 Subject: Change in osmo-trx[master]: logging: Introduce new "DDEV" category for device-specific code Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10496 Change subject: logging: Introduce new "DDEV" category for device-specific code ...................................................................... logging: Introduce new "DDEV" category for device-specific code The DMAIN category got too overloaded. Let's have the code in Transceive52M/device/* use the new DDEV category. Also, in some cases the log levels have been adjusted to ensure that enabling INFO level should not result in a complete overflow of messages during normal operation. Change-Id: I844fe4a75bf277cd3cc5bd8fa06e06ad97b2ea95 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.cpp 5 files changed, 179 insertions(+), 172 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/96/10496/1 diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index 01854c0..c6de21a 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -10,9 +10,15 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DDEV] = { + .name = "DDEV", + .description = "Device/Driver specific code", + .color = NULL, + .enabled = 1, .loglevel = LOGL_INFO, + }, [DLMS] = { .name = "DLMS", - .description = "LimeSuite category", + .description = "Logging from within LimeSuite itself", .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 06ad74e..f8f6239 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -5,5 +5,6 @@ /* Debug Areas of the code */ enum { DMAIN, + DDEV, DLMS, }; diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index ffea505..881cfb7 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -46,7 +46,7 @@ RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), m_lms_dev(NULL) { - LOG(INFO) << "creating LMS device..."; + LOGC(DDEV, INFO) << "creating LMS device..."; m_lms_stream_rx.resize(chans); m_lms_stream_tx.resize(chans); @@ -82,7 +82,7 @@ static void print_range(const char* name, lms_range_t *range) { - LOG(DEBUG) << name << ": Min=" << range->min << " Max=" << range->max + LOGC(DDEV, INFO) << name << ": Min=" << range->min << " Max=" << range->max << " Step=" << range->step; } @@ -96,36 +96,36 @@ unsigned int i, n; int rc; - LOG(INFO) << "Opening LMS device.."; + LOGC(DDEV, INFO) << "Opening LMS device.."; LMS_RegisterLogHandler(&lms_log_callback); if ((n = LMS_GetDeviceList(NULL)) < 0) - LOG(ERROR) << "LMS_GetDeviceList(NULL) failed"; - LOG(DEBUG) << "Devices found: " << n; + LOGC(DDEV, ERROR) << "LMS_GetDeviceList(NULL) failed"; + LOGC(DDEV, INFO) << "Devices found: " << n; if (n < 1) return -1; info_list = new lms_info_str_t[n]; if (LMS_GetDeviceList(info_list) < 0) - LOG(ERROR) << "LMS_GetDeviceList(info_list) failed"; + LOGC(DDEV, ERROR) << "LMS_GetDeviceList(info_list) failed"; for (i = 0; i < n; i++) - LOG(DEBUG) << "Device [" << i << "]: " << info_list[i]; + LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i]; rc = LMS_Open(&m_lms_dev, info_list[0], NULL); if (rc != 0) { - LOG(ERROR) << "LMS_GetDeviceList() failed)"; + LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)"; delete [] info_list; return -1; } delete [] info_list; - LOG(INFO) << "Init LMS device"; + LOGC(DDEV, INFO) << "Init LMS device"; if (LMS_Init(m_lms_dev) != 0) { - LOG(ERROR) << "LMS_Init() failed"; + LOGC(DDEV, ERROR) << "LMS_Init() failed"; return -1; } @@ -133,35 +133,35 @@ goto out_close; print_range("Sample Rate", &range_sr); - LOG(DEBUG) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps; + LOGC(DDEV, INFO) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps; if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 32) < 0) goto out_close; if (LMS_GetSampleRate(m_lms_dev, LMS_CH_RX, 0, &sr_host, &sr_rf)) goto out_close; - LOG(DEBUG) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; + LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; /* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */ ts_offset = static_cast(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */ switch (ref) { case REF_INTERNAL: - LOG(DEBUG) << "Setting Internal clock reference"; + LOGC(DDEV, INFO) << "Setting Internal clock reference"; /* Ugly API: Selecting clock source implicit by writing to VCTCXO DAC ?!? */ if (LMS_VCTCXORead(m_lms_dev, &dac_val) < 0) goto out_close; - LOG(DEBUG) << "Setting VCTCXO to " << dac_val; + LOGC(DDEV, INFO) << "Setting VCTCXO to " << dac_val; if (LMS_VCTCXOWrite(m_lms_dev, dac_val) < 0) goto out_close; break; case REF_EXTERNAL: - LOG(DEBUG) << "Setting External clock reference to " << 10000000.0; + LOGC(DDEV, INFO) << "Setting External clock reference to " << 10000000.0; /* Assume an external 10 MHz reference clock */ if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0) goto out_close; break; default: - LOG(ALERT) << "Invalid reference type"; + LOGC(DDEV, ALERT) << "Invalid reference type"; goto out_close; } @@ -174,21 +174,21 @@ lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min), range_lpfbw_rx.max); lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max); - LOG(DEBUG) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx; + LOGC(DDEV, INFO) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx; if (!set_antennas()) { - LOG(ALERT) << "LMS antenna setting failed"; + LOGC(DDEV, ALERT) << "LMS antenna setting failed"; return -1; } /* Perform Rx and Tx calibration */ for (i=0; i 0)) { rc = LMS_RecvStream(&m_lms_stream_rx[0], &buffer[0], len, &rx_metadata, 100); - LOG(DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp; + LOGC(DDEV, DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp; if (rc != len) { - LOG(ALERT) << "LMS: Device receive timed out"; + LOGC(DDEV, ALERT) << "LMS: Device receive timed out"; delete[] buffer; return false; } @@ -379,7 +379,7 @@ ts_initial = rx_metadata.timestamp + len; } - LOG(INFO) << "Initial timestamp " << ts_initial << std::endl; + LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl; delete[] buffer; return true; } @@ -389,18 +389,18 @@ int idx; if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } idx = get_ant_idx(ant, LMS_CH_RX, chan); if (idx < 0) { - LOG(ALERT) << "Invalid Rx Antenna"; + LOGC(DDEV, ALERT) << "Invalid Rx Antenna"; return false; } if (LMS_SetAntenna(m_lms_dev, LMS_CH_RX, chan, idx) < 0) { - LOG(ALERT) << "Unable to set Rx Antenna"; + LOGC(DDEV, ALERT) << "Unable to set Rx Antenna"; } return true; @@ -412,18 +412,18 @@ int idx; if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } idx = LMS_GetAntenna(m_lms_dev, LMS_CH_RX, chan); if (idx < 0) { - LOG(ALERT) << "Error getting Rx Antenna"; + LOGC(DDEV, ALERT) << "Error getting Rx Antenna"; return ""; } if (LMS_GetAntennaList(m_lms_dev, LMS_CH_RX, chan, name_list) < idx) { - LOG(ALERT) << "Error getting Rx Antenna List"; + LOGC(DDEV, ALERT) << "Error getting Rx Antenna List"; return ""; } @@ -435,18 +435,18 @@ int idx; if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } idx = get_ant_idx(ant, LMS_CH_TX, chan); if (idx < 0) { - LOG(ALERT) << "Invalid Rx Antenna"; + LOGC(DDEV, ALERT) << "Invalid Rx Antenna"; return false; } if (LMS_SetAntenna(m_lms_dev, LMS_CH_TX, chan, idx) < 0) { - LOG(ALERT) << "Unable to set Rx Antenna"; + LOGC(DDEV, ALERT) << "Unable to set Rx Antenna"; } return true; @@ -458,18 +458,18 @@ int idx; if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } idx = LMS_GetAntenna(m_lms_dev, LMS_CH_TX, chan); if (idx < 0) { - LOG(ALERT) << "Error getting Tx Antenna"; + LOGC(DDEV, ALERT) << "Error getting Tx Antenna"; return ""; } if (LMS_GetAntennaList(m_lms_dev, LMS_CH_TX, chan, name_list) < idx) { - LOG(ALERT) << "Error getting Tx Antenna List"; + LOGC(DDEV, ALERT) << "Error getting Tx Antenna List"; return ""; } @@ -502,7 +502,7 @@ rx_metadata.timestamp = 0; if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } @@ -512,9 +512,9 @@ thread_enable_cancel(false); rc = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len, &rx_metadata, 100); if (timestamp != (TIMESTAMP)rx_metadata.timestamp) - LOG(ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp; + LOGC(DDEV, ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp; if (rc != len) { - LOG(ALERT) << "LMS: Device receive timed out"; + LOGC(DDEV, ALERT) << "LMS: Device receive timed out"; } if (LMS_GetStreamStatus(&m_lms_stream_rx[i], &status) == 0) { @@ -550,23 +550,23 @@ tx_metadata.timestamp = timestamp - ts_offset; /* Shift Tx time by offset */ if (isControl) { - LOG(ERR) << "Control packets not supported"; + LOGC(DDEV, ERR) << "Control packets not supported"; return 0; } if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } *underrun = false; for (i = 0; i &rx_paths) { if (tx_sps != rx_sps) { - LOG(ERROR) << "LMS Requires tx_sps == rx_sps"; + LOGC(DDEV, ERROR) << "LMS Requires tx_sps == rx_sps"; return NULL; } if (lo_offset != 0.0) { - LOG(ERROR) << "LMS doesn't support lo_offset"; + LOGC(DDEV, ERROR) << "LMS doesn't support lo_offset"; return NULL; } return new LMSDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 4af8f87..63d3dec 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -340,13 +340,13 @@ { switch (type) { case uhd::msg::status: - LOG(INFO) << msg; + LOGC(DDEV, INFO) << msg; break; case uhd::msg::warning: - LOG(WARNING) << msg; + LOGC(DDEV, WARNING) << msg; break; case uhd::msg::error: - LOG(ERR) << msg; + LOGC(DDEV, ERR) << msg; break; case uhd::msg::fastpath: break; @@ -388,7 +388,7 @@ if (dev_type == UMTRX) { std::vector gain_stages = usrp_dev->get_tx_gain_names(0); if (gain_stages[0] == "VGA") { - LOG(WARNING) << "Update your UHD version for a proper Tx gain support"; + LOGC(DDEV, WARNING) << "Update your UHD version for a proper Tx gain support"; } if (gain_stages[0] == "VGA" || gain_stages[0] == "PA") { range = usrp_dev->get_tx_gain_range(); @@ -404,23 +404,23 @@ tx_gain_min = range.start(); tx_gain_max = range.stop(); } - LOG(INFO) << "Supported Tx gain range [" << tx_gain_min << "; " << tx_gain_max << "]"; + LOGC(DDEV, INFO) << "Supported Tx gain range [" << tx_gain_min << "; " << tx_gain_max << "]"; range = usrp_dev->get_rx_gain_range(); rx_gain_min = range.start(); rx_gain_max = range.stop(); - LOG(INFO) << "Supported Rx gain range [" << rx_gain_min << "; " << rx_gain_max << "]"; + LOGC(DDEV, INFO) << "Supported Rx gain range [" << rx_gain_min << "; " << rx_gain_max << "]"; for (size_t i = 0; i < tx_gains.size(); i++) { double gain = (tx_gain_min + tx_gain_max) / 2; - LOG(INFO) << "Default setting Tx gain for channel " << i << " to " << gain; + LOGC(DDEV, INFO) << "Default setting Tx gain for channel " << i << " to " << gain; usrp_dev->set_tx_gain(gain, i); tx_gains[i] = usrp_dev->get_tx_gain(i); } for (size_t i = 0; i < rx_gains.size(); i++) { double gain = (rx_gain_min + rx_gain_max) / 2; - LOG(INFO) << "Default setting Rx gain for channel " << i << " to " << gain; + LOGC(DDEV, INFO) << "Default setting Rx gain for channel " << i << " to " << gain; usrp_dev->set_rx_gain(gain, i); rx_gains[i] = usrp_dev->get_rx_gain(i); } @@ -444,7 +444,7 @@ rx_rate = usrp_dev->get_rx_rate(); ts_offset = static_cast(desc.offset * rx_rate); - LOG(INFO) << "Rates configured for " << desc.str; + LOGC(DDEV, INFO) << "Rates configured for " << desc.str; } double uhd_device::setTxGain(double db, size_t chan) @@ -453,7 +453,7 @@ chan = 0; if (chan >= tx_gains.size()) { - LOG(ALERT) << "Requested non-existent channel" << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan; return 0.0f; } @@ -476,7 +476,7 @@ tx_gains[chan] = usrp_dev->get_tx_gain(chan); - LOG(INFO) << "Set TX gain to " << tx_gains[chan] << "dB (asked for " << db << "dB)"; + LOGC(DDEV, INFO) << "Set TX gain to " << tx_gains[chan] << "dB (asked for " << db << "dB)"; return tx_gains[chan]; } @@ -484,14 +484,14 @@ double uhd_device::setRxGain(double db, size_t chan) { if (chan >= rx_gains.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; } usrp_dev->set_rx_gain(db, chan); rx_gains[chan] = usrp_dev->get_rx_gain(chan); - LOG(INFO) << "Set RX gain to " << rx_gains[chan] << "dB (asked for " << db << "dB)"; + LOGC(DDEV, INFO) << "Set RX gain to " << rx_gains[chan] << "dB (asked for " << db << "dB)"; return rx_gains[chan]; } @@ -502,7 +502,7 @@ chan = 0; if (chan >= rx_gains.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; } @@ -550,7 +550,7 @@ mapIter++; } - LOG(ALERT) << "Unsupported device " << devString; + LOGC(DDEV, ALERT) << "Unsupported device " << devString; return false; } @@ -621,16 +621,16 @@ uhd::device_addr_t addr(args); uhd::device_addrs_t dev_addrs = uhd::device::find(addr); if (dev_addrs.size() == 0) { - LOG(ALERT) << "No UHD devices found with address '" << args << "'"; + LOGC(DDEV, ALERT) << "No UHD devices found with address '" << args << "'"; return -1; } // Use the first found device - LOG(INFO) << "Using discovered UHD device " << dev_addrs[0].to_string(); + LOGC(DDEV, INFO) << "Using discovered UHD device " << dev_addrs[0].to_string(); try { usrp_dev = uhd::usrp::multi_usrp::make(addr); } catch(...) { - LOG(ALERT) << "UHD make failed, device " << args; + LOGC(DDEV, ALERT) << "UHD make failed, device " << args; return -1; } @@ -639,19 +639,19 @@ return -1; if ((dev_type == E3XX) && !uhd_e3xx_version_chk()) { - LOG(ALERT) << "E3XX requires UHD 003.009.000 or greater"; + LOGC(DDEV, ALERT) << "E3XX requires UHD 003.009.000 or greater"; return -1; } try { set_channels(swap_channels); } catch (const std::exception &e) { - LOG(ALERT) << "Channel setting failed - " << e.what(); + LOGC(DDEV, ALERT) << "Channel setting failed - " << e.what(); return -1; } if (!set_antennas()) { - LOG(ALERT) << "UHD antenna setting failed"; + LOGC(DDEV, ALERT) << "UHD antenna setting failed"; return -1; } @@ -672,7 +672,7 @@ refstr = "gpsdo"; break; default: - LOG(ALERT) << "Invalid reference type"; + LOGC(DDEV, ALERT) << "Invalid reference type"; return -1; } @@ -681,7 +681,7 @@ try { set_rates(); } catch (const std::exception &e) { - LOG(ALERT) << "UHD rate setting failed - " << e.what(); + LOGC(DDEV, ALERT) << "UHD rate setting failed - " << e.what(); return -1; } @@ -720,7 +720,7 @@ init_gains(); // Print configuration - LOG(INFO) << "\n" << usrp_dev->get_pp_string(); + LOGC(DDEV, INFO) << "\n" << usrp_dev->get_pp_string(); if (iface == MULTI_ARFCN) return MULTI_ARFCN; @@ -763,7 +763,7 @@ if (!num_smpls) { switch (md.error_code) { case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: - LOG(ALERT) << "Device timed out"; + LOGC(DDEV, ALERT) << "Device timed out"; return false; default: continue; @@ -773,7 +773,7 @@ ts_initial = md.time_spec.to_ticks(rx_rate); } - LOG(INFO) << "Initial timestamp " << ts_initial << std::endl; + LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl; return true; } @@ -798,10 +798,10 @@ bool uhd_device::start() { - LOG(INFO) << "Starting USRP..."; + LOGC(DDEV, INFO) << "Starting USRP..."; if (started) { - LOG(ERR) << "Device already started"; + LOGC(DDEV, ERR) << "Device already started"; return false; } @@ -819,7 +819,7 @@ // Display usrp time double time_now = usrp_dev->get_time_now().get_real_secs(); - LOG(INFO) << "The current time is " << time_now << " seconds"; + LOGC(DDEV, INFO) << "The current time is " << time_now << " seconds"; started = true; return true; @@ -852,11 +852,11 @@ int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls) { if (!num_smpls) { - LOG(ERR) << str_code(md); + LOGC(DDEV, ERR) << str_code(md); switch (md.error_code) { case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: - LOG(ALERT) << "UHD: Receive timed out"; + LOGC(DDEV, ALERT) << "UHD: Receive timed out"; return ERROR_TIMEOUT; case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW: case uhd::rx_metadata_t::ERROR_CODE_LATE_COMMAND: @@ -869,14 +869,14 @@ // Missing timestamp if (!md.has_time_spec) { - LOG(ALERT) << "UHD: Received packet missing timestamp"; + LOGC(DDEV, ALERT) << "UHD: Received packet missing timestamp"; return ERROR_UNRECOVERABLE; } // Monotonicity check if (md.time_spec < prev_ts) { - LOG(ALERT) << "UHD: Loss of monotonic time"; - LOG(ALERT) << "Current time: " << md.time_spec.get_real_secs() << ", " + LOGC(DDEV, ALERT) << "UHD: Loss of monotonic time"; + LOGC(DDEV, ALERT) << "Current time: " << md.time_spec.get_real_secs() << ", " << "Previous time: " << prev_ts.get_real_secs(); return ERROR_TIMING; } @@ -899,7 +899,7 @@ uhd::rx_metadata_t metadata; if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } @@ -910,13 +910,13 @@ timestamp += ts_offset; ts = uhd::time_spec_t::from_ticks(timestamp, rx_rate); - LOG(DEBUG) << "Requested timestamp = " << ts.get_real_secs(); + LOGC(DDEV, DEBUG) << "Requested timestamp = " << ts.get_real_secs(); // Check that timestamp is valid rc = rx_buffers[0]->avail_smpls(timestamp); if (rc < 0) { - LOG(ERR) << rx_buffers[0]->str_code(rc); - LOG(ERR) << rx_buffers[0]->str_status(timestamp); + LOGC(DDEV, ERR) << rx_buffers[0]->str_code(rc); + LOGC(DDEV, ERR) << rx_buffers[0]->str_status(timestamp); return 0; } @@ -941,8 +941,8 @@ rc = check_rx_md_err(metadata, num_smpls); switch (rc) { case ERROR_UNRECOVERABLE: - LOG(ALERT) << "UHD: Version " << uhd::get_version_string(); - LOG(ALERT) << "UHD: Unrecoverable error, exiting..."; + LOGC(DDEV, ALERT) << "UHD: Version " << uhd::get_version_string(); + LOGC(DDEV, ALERT) << "UHD: Unrecoverable error, exiting..."; exit(-1); case ERROR_TIMEOUT: // Assume stopping condition @@ -954,7 +954,7 @@ } ts = metadata.time_spec; - LOG(DEBUG) << "Received timestamp = " << ts.get_real_secs(); + LOGC(DDEV, DEBUG) << "Received timestamp = " << ts.get_real_secs(); for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->write((short *) &pkt_bufs[i].front(), @@ -963,8 +963,8 @@ // Continue on local overrun, exit on other errors if ((rc < 0)) { - LOG(ERR) << rx_buffers[i]->str_code(rc); - LOG(ERR) << rx_buffers[i]->str_status(timestamp); + LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc); + LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp); if (rc != smpl_buf::ERROR_OVERFLOW) return 0; } @@ -975,8 +975,8 @@ for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->read(bufs[i], len, timestamp); if ((rc < 0) || (rc != len)) { - LOG(ERR) << rx_buffers[i]->str_code(rc); - LOG(ERR) << rx_buffers[i]->str_status(timestamp); + LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc); + LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp); return 0; } } @@ -997,12 +997,12 @@ // No control packets if (isControl) { - LOG(ERR) << "Control packets not supported"; + LOGC(DDEV, ERR) << "Control packets not supported"; return 0; } if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } @@ -1011,14 +1011,14 @@ drop_cnt++; if (drop_cnt == 1) { - LOG(DEBUG) << "Aligning transmitter: stop burst"; + LOGC(DDEV, DEBUG) << "Aligning transmitter: stop burst"; *underrun = true; metadata.end_of_burst = true; } else if (drop_cnt < 30) { - LOG(DEBUG) << "Aligning transmitter: packet advance"; + LOGC(DDEV, DEBUG) << "Aligning transmitter: packet advance"; return len; } else { - LOG(DEBUG) << "Aligning transmitter: start burst"; + LOGC(DDEV, DEBUG) << "Aligning transmitter: start burst"; metadata.start_of_burst = true; aligned = true; drop_cnt = 0; @@ -1030,7 +1030,7 @@ thread_enable_cancel(true); if (num_smpls != (unsigned) len) { - LOG(ALERT) << "UHD: Device send timed out"; + LOGC(DDEV, ALERT) << "UHD: Device send timed out"; } return num_smpls; @@ -1066,7 +1066,7 @@ return uhd::tune_request_t(freq, lo_offset); } else if ((dev_type != B210) || (chans > 2) || (chan > 1)) { - LOG(ALERT) << chans << " channels unsupported"; + LOGC(DDEV, ALERT) << chans << " channels unsupported"; return treq; } @@ -1082,7 +1082,7 @@ /* Find center frequency between channels */ rf_spread = fabs(freqs[!chan] - freq); if (rf_spread > dev_param_map.at(dev_key(B210, tx_sps, rx_sps)).mcr) { - LOG(ALERT) << rf_spread << "Hz tuning spread not supported\n"; + LOGC(DDEV, ALERT) << rf_spread << "Hz tuning spread not supported\n"; return treq; } @@ -1108,7 +1108,7 @@ tres = usrp_dev->set_rx_freq(treq, chan); rx_freqs[chan] = usrp_dev->get_rx_freq(chan); } - LOG(INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; if ((chans == 1) || ((chans == 2) && dev_type == UMTRX)) return true; @@ -1128,7 +1128,7 @@ rx_freqs[!chan] = usrp_dev->get_rx_freq(!chan); } - LOG(INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; } return true; @@ -1137,7 +1137,7 @@ bool uhd_device::setTxFreq(double wFreq, size_t chan) { if (chan >= tx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } ScopedLock lock(tune_lock); @@ -1148,7 +1148,7 @@ bool uhd_device::setRxFreq(double wFreq, size_t chan) { if (chan >= rx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } ScopedLock lock(tune_lock); @@ -1159,7 +1159,7 @@ double uhd_device::getTxFreq(size_t chan) { if (chan >= tx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0; } @@ -1169,7 +1169,7 @@ double uhd_device::getRxFreq(size_t chan) { if (chan >= rx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0; } @@ -1180,23 +1180,23 @@ { std::vector avail; if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } avail = usrp_dev->get_rx_antennas(chan); if (std::find(avail.begin(), avail.end(), ant) == avail.end()) { - LOG(ALERT) << "Requested non-existent Rx antenna " << ant << " on channel " << chan; - LOG(INFO) << "Available Rx antennas: "; + LOGC(DDEV, ALERT) << "Requested non-existent Rx antenna " << ant << " on channel " << chan; + LOGC(DDEV, INFO) << "Available Rx antennas: "; for (std::vector::const_iterator i = avail.begin(); i != avail.end(); ++i) - LOG(INFO) << "- '" << *i << "'"; + LOGC(DDEV, INFO) << "- '" << *i << "'"; return false; } usrp_dev->set_rx_antenna(ant, chan); rx_paths[chan] = usrp_dev->get_rx_antenna(chan); if (ant != rx_paths[chan]) { - LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << rx_paths[chan]; + LOGC(DDEV, ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << rx_paths[chan]; return false; } @@ -1206,7 +1206,7 @@ std::string uhd_device::getRxAntenna(size_t chan) { if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } return usrp_dev->get_rx_antenna(chan); @@ -1216,23 +1216,23 @@ { std::vector avail; if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } avail = usrp_dev->get_tx_antennas(chan); if (std::find(avail.begin(), avail.end(), ant) == avail.end()) { - LOG(ALERT) << "Requested non-existent Tx antenna " << ant << " on channel " << chan; - LOG(INFO) << "Available Tx antennas: "; + LOGC(DDEV, ALERT) << "Requested non-existent Tx antenna " << ant << " on channel " << chan; + LOGC(DDEV, INFO) << "Available Tx antennas: "; for (std::vector::const_iterator i = avail.begin(); i != avail.end(); ++i) - LOG(INFO) << "- '" << *i << "'"; + LOGC(DDEV, INFO) << "- '" << *i << "'"; return false; } usrp_dev->set_tx_antenna(ant, chan); tx_paths[chan] = usrp_dev->get_tx_antenna(chan); if (ant != tx_paths[chan]) { - LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << tx_paths[chan]; + LOGC(DDEV, ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << tx_paths[chan]; return false; } @@ -1242,7 +1242,7 @@ std::string uhd_device::getTxAntenna(size_t chan) { if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } return usrp_dev->get_tx_antenna(chan); @@ -1310,7 +1310,7 @@ if ((md.event_code != uhd::async_metadata_t::EVENT_CODE_UNDERFLOW) && (md.event_code != uhd::async_metadata_t::EVENT_CODE_TIME_ERROR)) { - LOG(ERR) << str_code(md); + LOGC(DDEV, ERR) << str_code(md); } } @@ -1470,15 +1470,15 @@ return ERROR_TIMESTAMP; if (timestamp < time_end) { - LOG(ERR) << "Overwriting old buffer data: timestamp="<fpga_master_clock_freq() != masterClockRate) { - LOG(ALERT) << "WRONG FPGA clock freq = " << m_uRx->fpga_master_clock_freq() + LOGC(DDEV, ALERT) << "WRONG FPGA clock freq = " << m_uRx->fpga_master_clock_freq() << ", desired clock freq = " << masterClockRate; m_uRx.reset(); return -1; @@ -132,14 +132,14 @@ } catch(...) { - LOG(ALERT) << "make failed on Tx"; + LOGC(DDEV, ALERT) << "make failed on Tx"; m_uTx.reset(); return -1; } if (m_uTx->fpga_master_clock_freq() != masterClockRate) { - LOG(ALERT) << "WRONG FPGA clock freq = " << m_uTx->fpga_master_clock_freq() + LOGC(DDEV, ALERT) << "WRONG FPGA clock freq = " << m_uTx->fpga_master_clock_freq() << ", desired clock freq = " << masterClockRate; m_uTx.reset(); return -1; @@ -186,7 +186,7 @@ bool USRPDevice::start() { - LOG(INFO) << "starting USRP..."; + LOGC(DDEV, INFO) << "starting USRP..."; #ifndef SWLOOPBACK if (!m_uRx && !skipRx) return false; if (!m_uTx) return false; @@ -270,7 +270,7 @@ double USRPDevice::setTxGain(double dB, size_t chan) { if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return 0.0; } @@ -280,10 +280,10 @@ if (dB < minTxGain()) dB = minTxGain(); - LOG(NOTICE) << "Setting TX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "Setting TX gain to " << dB << " dB."; if (!m_dbTx->set_gain(dB)) - LOG(ERR) << "Error setting TX gain"; + LOGC(DDEV, ERR) << "Error setting TX gain"; writeLock.unlock(); @@ -294,7 +294,7 @@ double USRPDevice::setRxGain(double dB, size_t chan) { if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return 0.0; } @@ -306,10 +306,10 @@ if (dB < minRxGain()) dB = minRxGain(); - LOG(NOTICE) << "Setting RX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "Setting RX gain to " << dB << " dB."; if (!m_dbRx->set_gain(dB)) - LOG(ERR) << "Error setting RX gain"; + LOGC(DDEV, ERR) << "Error setting RX gain"; writeLock.unlock(); @@ -319,40 +319,40 @@ bool USRPDevice::setRxAntenna(const std::string &ant, size_t chan) { if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return true; } std::string USRPDevice::getRxAntenna(size_t chan) { if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return ""; } bool USRPDevice::setTxAntenna(const std::string &ant, size_t chan) { if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return true; } std::string USRPDevice::getTxAntenna(size_t chan) { if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return ""; } @@ -405,11 +405,11 @@ uint32_t word0 = usrp_to_host_u32(tmpBuf[0]); uint32_t chan = (word0 >> 16) & 0x1f; unsigned payloadSz = word0 & 0x1ff; - LOG(DEBUG) << "first two bytes: " << hex << word0 << " " << dec << pktTimestamp; + LOGC(DDEV, DEBUG) << "first two bytes: " << hex << word0 << " " << dec << pktTimestamp; bool incrementHi32 = ((lastPktTimestamp & 0x0ffffffffll) > pktTimestamp); if (incrementHi32 && (timeStart!=0)) { - LOG(DEBUG) << "high 32 increment!!!"; + LOGC(DDEV, DEBUG) << "high 32 increment!!!"; hi32Timestamp++; } pktTimestamp = (((TIMESTAMP) hi32Timestamp) << 32) | pktTimestamp; @@ -421,19 +421,19 @@ if ((word2 >> 16) == ((0x01 << 8) | 0x02)) { timestamp -= timestampOffset; timestampOffset = pktTimestamp - pingTimestamp + pingOffset; - LOG(DEBUG) << "updating timestamp offset to: " << timestampOffset; + LOGC(DDEV, DEBUG) << "updating timestamp offset to: " << timestampOffset; timestamp += timestampOffset; isAligned = true; } continue; } if (chan != 0) { - LOG(DEBUG) << "chan: " << chan << ", timestamp: " << pktTimestamp << ", sz:" << payloadSz; + LOGC(DDEV, DEBUG) << "chan: " << chan << ", timestamp: " << pktTimestamp << ", sz:" << payloadSz; continue; } if ((word0 >> 28) & 0x04) { if (underrun) *underrun = true; - LOG(DEBUG) << "UNDERRUN in TRX->USRP interface"; + LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface"; } if (RSSI) *RSSI = (word0 >> 21) & 0x3f; @@ -454,7 +454,7 @@ if (pktTimestamp + payloadSz/2/sizeof(short) > timeEnd) timeEnd = pktTimestamp+payloadSz/2/sizeof(short); - LOG(DEBUG) << "timeStart: " << timeStart << ", timeEnd: " << timeEnd << ", pktTimestamp: " << pktTimestamp; + LOGC(DDEV, DEBUG) << "timeStart: " << timeStart << ", timeEnd: " << timeEnd << ", pktTimestamp: " << pktTimestamp; } } @@ -462,14 +462,14 @@ // copy desired data to buf unsigned bufStart = dataStart+(timestamp-timeStart); if (bufStart + len < currDataSize/2) { - LOG(DEBUG) << "bufStart: " << bufStart; + LOGC(DDEV, DEBUG) << "bufStart: " << bufStart; memcpy(buf,data+bufStart*2,len*2*sizeof(short)); memset(data+bufStart*2,0,len*2*sizeof(short)); } else { - LOG(DEBUG) << "len: " << len << ", currDataSize/2: " << currDataSize/2 << ", bufStart: " << bufStart; + LOGC(DDEV, DEBUG) << "len: " << len << ", currDataSize/2: " << currDataSize/2 << ", bufStart: " << bufStart; unsigned firstLength = (currDataSize/2-bufStart); - LOG(DEBUG) << "firstLength: " << firstLength; + LOGC(DDEV, DEBUG) << "firstLength: " << firstLength; memcpy(buf,data+bufStart*2,firstLength*2*sizeof(short)); memset(data+bufStart*2,0,firstLength*2*sizeof(short)); memcpy(buf+firstLength*2,data,(len-firstLength)*2*sizeof(short)); @@ -599,19 +599,19 @@ usrp_tune_result result; if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return false; } if (m_uTx->tune(txSubdevSpec.side, m_dbTx, wFreq, &result)) { - LOG(INFO) << "set TX: " << wFreq << std::endl + LOGC(DDEV, INFO) << "set TX: " << wFreq << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; return true; } else { - LOG(ALERT) << "set TX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set TX: " << wFreq << "failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; @@ -624,19 +624,19 @@ usrp_tune_result result; if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return false; } if (m_uRx->tune(0, m_dbRx, wFreq, &result)) { - LOG(INFO) << "set RX: " << wFreq << std::endl + LOGC(DDEV, INFO) << "set RX: " << wFreq << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; return true; } else { - LOG(ALERT) << "set RX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set RX: " << wFreq << "failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; @@ -656,15 +656,15 @@ const std::vector& rx_paths) { if (tx_sps != rx_sps) { - LOG(ERROR) << "USRP1 requires tx_sps == rx_sps"; + LOGC(DDEV, ERROR) << "USRP1 requires tx_sps == rx_sps"; return NULL; } if (chans != 1) { - LOG(ERROR) << "USRP1 supports only 1 channel"; + LOGC(DDEV, ERROR) << "USRP1 supports only 1 channel"; return NULL; } if (lo_offset != 0.0) { - LOG(ERROR) << "USRP1 doesn't support lo_offset"; + LOGC(DDEV, ERROR) << "USRP1 doesn't support lo_offset"; return NULL; } return new USRPDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); -- To view, visit https://gerrit.osmocom.org/10496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I844fe4a75bf277cd3cc5bd8fa06e06ad97b2ea95 Gerrit-Change-Number: 10496 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 17 20:41:01 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Aug 2018 20:41:01 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7732e060969_1e08db068c2465b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: build on obs-arm-4:14 did not create a logfile gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Aug 17 21:37:29 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 17 Aug 2018 21:37:29 +0000 Subject: Change in osmo-sip-connector[master]: Logging: in check_rtp_create() log the IP address in human readable d... In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10490 ) Change subject: Logging: in check_rtp_create() log the IP address in human readable dotted quad format. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10490/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/10490/1/src/mncc.c at 386 PS1, Line 386: inet_ntoa(net) > inet_ntoa is specified as being used with ip addresses in *network byte order*. [?] I copied the code from http://git.osmocom.org/osmo-sip-connector/tree/src/sdp.c#n168 and http://git.osmocom.org/osmo-sip-connector/tree/src/sdp.c#n185 which would appear to implement the same (error). Is it the case that in practice (at least on my x86 platform) that ntohl() and htonl() will give the same result? https://stackoverflow.com/questions/15863775/ntohl-vs-htonl-in-little-endian This may be related then to https://osmocom.org/issues/3431 ? -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 17 Aug 2018 21:37:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Fri Aug 17 21:52:48 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 17 Aug 2018 21:52:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7743be48d64_1e08db068c2598ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: build on obs-arm-4:5 did not create a logfile gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Aug 18 07:13:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 18 Aug 2018 07:13:00 +0000 Subject: Change in osmo-trx[master]: logging: Introduce new "DDEV" category for device-specific code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10496 ) Change subject: logging: Introduce new "DDEV" category for device-specific code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I844fe4a75bf277cd3cc5bd8fa06e06ad97b2ea95 Gerrit-Change-Number: 10496 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 18 Aug 2018 07:13:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 18 07:13:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 18 Aug 2018 07:13:01 +0000 Subject: Change in osmo-trx[master]: logging: Introduce new "DDEV" category for device-specific code In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10496 ) Change subject: logging: Introduce new "DDEV" category for device-specific code ...................................................................... logging: Introduce new "DDEV" category for device-specific code The DMAIN category got too overloaded. Let's have the code in Transceive52M/device/* use the new DDEV category. Also, in some cases the log levels have been adjusted to ensure that enabling INFO level should not result in a complete overflow of messages during normal operation. Change-Id: I844fe4a75bf277cd3cc5bd8fa06e06ad97b2ea95 --- M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.cpp 5 files changed, 179 insertions(+), 172 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index 01854c0..c6de21a 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -10,9 +10,15 @@ .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DDEV] = { + .name = "DDEV", + .description = "Device/Driver specific code", + .color = NULL, + .enabled = 1, .loglevel = LOGL_INFO, + }, [DLMS] = { .name = "DLMS", - .description = "LimeSuite category", + .description = "Logging from within LimeSuite itself", .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 06ad74e..f8f6239 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -5,5 +5,6 @@ /* Debug Areas of the code */ enum { DMAIN, + DDEV, DLMS, }; diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index ffea505..881cfb7 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -46,7 +46,7 @@ RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths), m_lms_dev(NULL) { - LOG(INFO) << "creating LMS device..."; + LOGC(DDEV, INFO) << "creating LMS device..."; m_lms_stream_rx.resize(chans); m_lms_stream_tx.resize(chans); @@ -82,7 +82,7 @@ static void print_range(const char* name, lms_range_t *range) { - LOG(DEBUG) << name << ": Min=" << range->min << " Max=" << range->max + LOGC(DDEV, INFO) << name << ": Min=" << range->min << " Max=" << range->max << " Step=" << range->step; } @@ -96,36 +96,36 @@ unsigned int i, n; int rc; - LOG(INFO) << "Opening LMS device.."; + LOGC(DDEV, INFO) << "Opening LMS device.."; LMS_RegisterLogHandler(&lms_log_callback); if ((n = LMS_GetDeviceList(NULL)) < 0) - LOG(ERROR) << "LMS_GetDeviceList(NULL) failed"; - LOG(DEBUG) << "Devices found: " << n; + LOGC(DDEV, ERROR) << "LMS_GetDeviceList(NULL) failed"; + LOGC(DDEV, INFO) << "Devices found: " << n; if (n < 1) return -1; info_list = new lms_info_str_t[n]; if (LMS_GetDeviceList(info_list) < 0) - LOG(ERROR) << "LMS_GetDeviceList(info_list) failed"; + LOGC(DDEV, ERROR) << "LMS_GetDeviceList(info_list) failed"; for (i = 0; i < n; i++) - LOG(DEBUG) << "Device [" << i << "]: " << info_list[i]; + LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i]; rc = LMS_Open(&m_lms_dev, info_list[0], NULL); if (rc != 0) { - LOG(ERROR) << "LMS_GetDeviceList() failed)"; + LOGC(DDEV, ERROR) << "LMS_GetDeviceList() failed)"; delete [] info_list; return -1; } delete [] info_list; - LOG(INFO) << "Init LMS device"; + LOGC(DDEV, INFO) << "Init LMS device"; if (LMS_Init(m_lms_dev) != 0) { - LOG(ERROR) << "LMS_Init() failed"; + LOGC(DDEV, ERROR) << "LMS_Init() failed"; return -1; } @@ -133,35 +133,35 @@ goto out_close; print_range("Sample Rate", &range_sr); - LOG(DEBUG) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps; + LOGC(DDEV, INFO) << "Setting sample rate to " << GSMRATE*tx_sps << " " << tx_sps; if (LMS_SetSampleRate(m_lms_dev, GSMRATE*tx_sps, 32) < 0) goto out_close; if (LMS_GetSampleRate(m_lms_dev, LMS_CH_RX, 0, &sr_host, &sr_rf)) goto out_close; - LOG(DEBUG) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; + LOGC(DDEV, INFO) << "Sample Rate: Host=" << sr_host << " RF=" << sr_rf; /* FIXME: make this device/model dependent, like UHDDevice:dev_param_map! */ ts_offset = static_cast(8.9e-5 * GSMRATE * tx_sps); /* time * sample_rate */ switch (ref) { case REF_INTERNAL: - LOG(DEBUG) << "Setting Internal clock reference"; + LOGC(DDEV, INFO) << "Setting Internal clock reference"; /* Ugly API: Selecting clock source implicit by writing to VCTCXO DAC ?!? */ if (LMS_VCTCXORead(m_lms_dev, &dac_val) < 0) goto out_close; - LOG(DEBUG) << "Setting VCTCXO to " << dac_val; + LOGC(DDEV, INFO) << "Setting VCTCXO to " << dac_val; if (LMS_VCTCXOWrite(m_lms_dev, dac_val) < 0) goto out_close; break; case REF_EXTERNAL: - LOG(DEBUG) << "Setting External clock reference to " << 10000000.0; + LOGC(DDEV, INFO) << "Setting External clock reference to " << 10000000.0; /* Assume an external 10 MHz reference clock */ if (LMS_SetClockFreq(m_lms_dev, LMS_CLOCK_EXTREF, 10000000.0) < 0) goto out_close; break; default: - LOG(ALERT) << "Invalid reference type"; + LOGC(DDEV, ALERT) << "Invalid reference type"; goto out_close; } @@ -174,21 +174,21 @@ lpfbw_rx = OSMO_MIN(OSMO_MAX(1.4001e6, range_lpfbw_rx.min), range_lpfbw_rx.max); lpfbw_tx = OSMO_MIN(OSMO_MAX(5.2e6, range_lpfbw_tx.min), range_lpfbw_tx.max); - LOG(DEBUG) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx; + LOGC(DDEV, INFO) << "LPFBW: Rx=" << lpfbw_rx << " Tx=" << lpfbw_tx; if (!set_antennas()) { - LOG(ALERT) << "LMS antenna setting failed"; + LOGC(DDEV, ALERT) << "LMS antenna setting failed"; return -1; } /* Perform Rx and Tx calibration */ for (i=0; i 0)) { rc = LMS_RecvStream(&m_lms_stream_rx[0], &buffer[0], len, &rx_metadata, 100); - LOG(DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp; + LOGC(DDEV, DEBUG) << "Flush: Recv buffer of len " << rc << " at " << std::hex << rx_metadata.timestamp; if (rc != len) { - LOG(ALERT) << "LMS: Device receive timed out"; + LOGC(DDEV, ALERT) << "LMS: Device receive timed out"; delete[] buffer; return false; } @@ -379,7 +379,7 @@ ts_initial = rx_metadata.timestamp + len; } - LOG(INFO) << "Initial timestamp " << ts_initial << std::endl; + LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl; delete[] buffer; return true; } @@ -389,18 +389,18 @@ int idx; if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } idx = get_ant_idx(ant, LMS_CH_RX, chan); if (idx < 0) { - LOG(ALERT) << "Invalid Rx Antenna"; + LOGC(DDEV, ALERT) << "Invalid Rx Antenna"; return false; } if (LMS_SetAntenna(m_lms_dev, LMS_CH_RX, chan, idx) < 0) { - LOG(ALERT) << "Unable to set Rx Antenna"; + LOGC(DDEV, ALERT) << "Unable to set Rx Antenna"; } return true; @@ -412,18 +412,18 @@ int idx; if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } idx = LMS_GetAntenna(m_lms_dev, LMS_CH_RX, chan); if (idx < 0) { - LOG(ALERT) << "Error getting Rx Antenna"; + LOGC(DDEV, ALERT) << "Error getting Rx Antenna"; return ""; } if (LMS_GetAntennaList(m_lms_dev, LMS_CH_RX, chan, name_list) < idx) { - LOG(ALERT) << "Error getting Rx Antenna List"; + LOGC(DDEV, ALERT) << "Error getting Rx Antenna List"; return ""; } @@ -435,18 +435,18 @@ int idx; if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } idx = get_ant_idx(ant, LMS_CH_TX, chan); if (idx < 0) { - LOG(ALERT) << "Invalid Rx Antenna"; + LOGC(DDEV, ALERT) << "Invalid Rx Antenna"; return false; } if (LMS_SetAntenna(m_lms_dev, LMS_CH_TX, chan, idx) < 0) { - LOG(ALERT) << "Unable to set Rx Antenna"; + LOGC(DDEV, ALERT) << "Unable to set Rx Antenna"; } return true; @@ -458,18 +458,18 @@ int idx; if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } idx = LMS_GetAntenna(m_lms_dev, LMS_CH_TX, chan); if (idx < 0) { - LOG(ALERT) << "Error getting Tx Antenna"; + LOGC(DDEV, ALERT) << "Error getting Tx Antenna"; return ""; } if (LMS_GetAntennaList(m_lms_dev, LMS_CH_TX, chan, name_list) < idx) { - LOG(ALERT) << "Error getting Tx Antenna List"; + LOGC(DDEV, ALERT) << "Error getting Tx Antenna List"; return ""; } @@ -502,7 +502,7 @@ rx_metadata.timestamp = 0; if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } @@ -512,9 +512,9 @@ thread_enable_cancel(false); rc = LMS_RecvStream(&m_lms_stream_rx[i], bufs[i], len, &rx_metadata, 100); if (timestamp != (TIMESTAMP)rx_metadata.timestamp) - LOG(ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp; + LOGC(DDEV, ALERT) << "chan "<< i << " recv buffer of len " << rc << " expect " << std::hex << timestamp << " got " << std::hex << (TIMESTAMP)rx_metadata.timestamp << " (" << std::hex << rx_metadata.timestamp <<") diff=" << rx_metadata.timestamp - timestamp; if (rc != len) { - LOG(ALERT) << "LMS: Device receive timed out"; + LOGC(DDEV, ALERT) << "LMS: Device receive timed out"; } if (LMS_GetStreamStatus(&m_lms_stream_rx[i], &status) == 0) { @@ -550,23 +550,23 @@ tx_metadata.timestamp = timestamp - ts_offset; /* Shift Tx time by offset */ if (isControl) { - LOG(ERR) << "Control packets not supported"; + LOGC(DDEV, ERR) << "Control packets not supported"; return 0; } if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } *underrun = false; for (i = 0; i &rx_paths) { if (tx_sps != rx_sps) { - LOG(ERROR) << "LMS Requires tx_sps == rx_sps"; + LOGC(DDEV, ERROR) << "LMS Requires tx_sps == rx_sps"; return NULL; } if (lo_offset != 0.0) { - LOG(ERROR) << "LMS doesn't support lo_offset"; + LOGC(DDEV, ERROR) << "LMS doesn't support lo_offset"; return NULL; } return new LMSDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 4af8f87..63d3dec 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -340,13 +340,13 @@ { switch (type) { case uhd::msg::status: - LOG(INFO) << msg; + LOGC(DDEV, INFO) << msg; break; case uhd::msg::warning: - LOG(WARNING) << msg; + LOGC(DDEV, WARNING) << msg; break; case uhd::msg::error: - LOG(ERR) << msg; + LOGC(DDEV, ERR) << msg; break; case uhd::msg::fastpath: break; @@ -388,7 +388,7 @@ if (dev_type == UMTRX) { std::vector gain_stages = usrp_dev->get_tx_gain_names(0); if (gain_stages[0] == "VGA") { - LOG(WARNING) << "Update your UHD version for a proper Tx gain support"; + LOGC(DDEV, WARNING) << "Update your UHD version for a proper Tx gain support"; } if (gain_stages[0] == "VGA" || gain_stages[0] == "PA") { range = usrp_dev->get_tx_gain_range(); @@ -404,23 +404,23 @@ tx_gain_min = range.start(); tx_gain_max = range.stop(); } - LOG(INFO) << "Supported Tx gain range [" << tx_gain_min << "; " << tx_gain_max << "]"; + LOGC(DDEV, INFO) << "Supported Tx gain range [" << tx_gain_min << "; " << tx_gain_max << "]"; range = usrp_dev->get_rx_gain_range(); rx_gain_min = range.start(); rx_gain_max = range.stop(); - LOG(INFO) << "Supported Rx gain range [" << rx_gain_min << "; " << rx_gain_max << "]"; + LOGC(DDEV, INFO) << "Supported Rx gain range [" << rx_gain_min << "; " << rx_gain_max << "]"; for (size_t i = 0; i < tx_gains.size(); i++) { double gain = (tx_gain_min + tx_gain_max) / 2; - LOG(INFO) << "Default setting Tx gain for channel " << i << " to " << gain; + LOGC(DDEV, INFO) << "Default setting Tx gain for channel " << i << " to " << gain; usrp_dev->set_tx_gain(gain, i); tx_gains[i] = usrp_dev->get_tx_gain(i); } for (size_t i = 0; i < rx_gains.size(); i++) { double gain = (rx_gain_min + rx_gain_max) / 2; - LOG(INFO) << "Default setting Rx gain for channel " << i << " to " << gain; + LOGC(DDEV, INFO) << "Default setting Rx gain for channel " << i << " to " << gain; usrp_dev->set_rx_gain(gain, i); rx_gains[i] = usrp_dev->get_rx_gain(i); } @@ -444,7 +444,7 @@ rx_rate = usrp_dev->get_rx_rate(); ts_offset = static_cast(desc.offset * rx_rate); - LOG(INFO) << "Rates configured for " << desc.str; + LOGC(DDEV, INFO) << "Rates configured for " << desc.str; } double uhd_device::setTxGain(double db, size_t chan) @@ -453,7 +453,7 @@ chan = 0; if (chan >= tx_gains.size()) { - LOG(ALERT) << "Requested non-existent channel" << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel" << chan; return 0.0f; } @@ -476,7 +476,7 @@ tx_gains[chan] = usrp_dev->get_tx_gain(chan); - LOG(INFO) << "Set TX gain to " << tx_gains[chan] << "dB (asked for " << db << "dB)"; + LOGC(DDEV, INFO) << "Set TX gain to " << tx_gains[chan] << "dB (asked for " << db << "dB)"; return tx_gains[chan]; } @@ -484,14 +484,14 @@ double uhd_device::setRxGain(double db, size_t chan) { if (chan >= rx_gains.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; } usrp_dev->set_rx_gain(db, chan); rx_gains[chan] = usrp_dev->get_rx_gain(chan); - LOG(INFO) << "Set RX gain to " << rx_gains[chan] << "dB (asked for " << db << "dB)"; + LOGC(DDEV, INFO) << "Set RX gain to " << rx_gains[chan] << "dB (asked for " << db << "dB)"; return rx_gains[chan]; } @@ -502,7 +502,7 @@ chan = 0; if (chan >= rx_gains.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; } @@ -550,7 +550,7 @@ mapIter++; } - LOG(ALERT) << "Unsupported device " << devString; + LOGC(DDEV, ALERT) << "Unsupported device " << devString; return false; } @@ -621,16 +621,16 @@ uhd::device_addr_t addr(args); uhd::device_addrs_t dev_addrs = uhd::device::find(addr); if (dev_addrs.size() == 0) { - LOG(ALERT) << "No UHD devices found with address '" << args << "'"; + LOGC(DDEV, ALERT) << "No UHD devices found with address '" << args << "'"; return -1; } // Use the first found device - LOG(INFO) << "Using discovered UHD device " << dev_addrs[0].to_string(); + LOGC(DDEV, INFO) << "Using discovered UHD device " << dev_addrs[0].to_string(); try { usrp_dev = uhd::usrp::multi_usrp::make(addr); } catch(...) { - LOG(ALERT) << "UHD make failed, device " << args; + LOGC(DDEV, ALERT) << "UHD make failed, device " << args; return -1; } @@ -639,19 +639,19 @@ return -1; if ((dev_type == E3XX) && !uhd_e3xx_version_chk()) { - LOG(ALERT) << "E3XX requires UHD 003.009.000 or greater"; + LOGC(DDEV, ALERT) << "E3XX requires UHD 003.009.000 or greater"; return -1; } try { set_channels(swap_channels); } catch (const std::exception &e) { - LOG(ALERT) << "Channel setting failed - " << e.what(); + LOGC(DDEV, ALERT) << "Channel setting failed - " << e.what(); return -1; } if (!set_antennas()) { - LOG(ALERT) << "UHD antenna setting failed"; + LOGC(DDEV, ALERT) << "UHD antenna setting failed"; return -1; } @@ -672,7 +672,7 @@ refstr = "gpsdo"; break; default: - LOG(ALERT) << "Invalid reference type"; + LOGC(DDEV, ALERT) << "Invalid reference type"; return -1; } @@ -681,7 +681,7 @@ try { set_rates(); } catch (const std::exception &e) { - LOG(ALERT) << "UHD rate setting failed - " << e.what(); + LOGC(DDEV, ALERT) << "UHD rate setting failed - " << e.what(); return -1; } @@ -720,7 +720,7 @@ init_gains(); // Print configuration - LOG(INFO) << "\n" << usrp_dev->get_pp_string(); + LOGC(DDEV, INFO) << "\n" << usrp_dev->get_pp_string(); if (iface == MULTI_ARFCN) return MULTI_ARFCN; @@ -763,7 +763,7 @@ if (!num_smpls) { switch (md.error_code) { case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: - LOG(ALERT) << "Device timed out"; + LOGC(DDEV, ALERT) << "Device timed out"; return false; default: continue; @@ -773,7 +773,7 @@ ts_initial = md.time_spec.to_ticks(rx_rate); } - LOG(INFO) << "Initial timestamp " << ts_initial << std::endl; + LOGC(DDEV, INFO) << "Initial timestamp " << ts_initial << std::endl; return true; } @@ -798,10 +798,10 @@ bool uhd_device::start() { - LOG(INFO) << "Starting USRP..."; + LOGC(DDEV, INFO) << "Starting USRP..."; if (started) { - LOG(ERR) << "Device already started"; + LOGC(DDEV, ERR) << "Device already started"; return false; } @@ -819,7 +819,7 @@ // Display usrp time double time_now = usrp_dev->get_time_now().get_real_secs(); - LOG(INFO) << "The current time is " << time_now << " seconds"; + LOGC(DDEV, INFO) << "The current time is " << time_now << " seconds"; started = true; return true; @@ -852,11 +852,11 @@ int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls) { if (!num_smpls) { - LOG(ERR) << str_code(md); + LOGC(DDEV, ERR) << str_code(md); switch (md.error_code) { case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT: - LOG(ALERT) << "UHD: Receive timed out"; + LOGC(DDEV, ALERT) << "UHD: Receive timed out"; return ERROR_TIMEOUT; case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW: case uhd::rx_metadata_t::ERROR_CODE_LATE_COMMAND: @@ -869,14 +869,14 @@ // Missing timestamp if (!md.has_time_spec) { - LOG(ALERT) << "UHD: Received packet missing timestamp"; + LOGC(DDEV, ALERT) << "UHD: Received packet missing timestamp"; return ERROR_UNRECOVERABLE; } // Monotonicity check if (md.time_spec < prev_ts) { - LOG(ALERT) << "UHD: Loss of monotonic time"; - LOG(ALERT) << "Current time: " << md.time_spec.get_real_secs() << ", " + LOGC(DDEV, ALERT) << "UHD: Loss of monotonic time"; + LOGC(DDEV, ALERT) << "Current time: " << md.time_spec.get_real_secs() << ", " << "Previous time: " << prev_ts.get_real_secs(); return ERROR_TIMING; } @@ -899,7 +899,7 @@ uhd::rx_metadata_t metadata; if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } @@ -910,13 +910,13 @@ timestamp += ts_offset; ts = uhd::time_spec_t::from_ticks(timestamp, rx_rate); - LOG(DEBUG) << "Requested timestamp = " << ts.get_real_secs(); + LOGC(DDEV, DEBUG) << "Requested timestamp = " << ts.get_real_secs(); // Check that timestamp is valid rc = rx_buffers[0]->avail_smpls(timestamp); if (rc < 0) { - LOG(ERR) << rx_buffers[0]->str_code(rc); - LOG(ERR) << rx_buffers[0]->str_status(timestamp); + LOGC(DDEV, ERR) << rx_buffers[0]->str_code(rc); + LOGC(DDEV, ERR) << rx_buffers[0]->str_status(timestamp); return 0; } @@ -941,8 +941,8 @@ rc = check_rx_md_err(metadata, num_smpls); switch (rc) { case ERROR_UNRECOVERABLE: - LOG(ALERT) << "UHD: Version " << uhd::get_version_string(); - LOG(ALERT) << "UHD: Unrecoverable error, exiting..."; + LOGC(DDEV, ALERT) << "UHD: Version " << uhd::get_version_string(); + LOGC(DDEV, ALERT) << "UHD: Unrecoverable error, exiting..."; exit(-1); case ERROR_TIMEOUT: // Assume stopping condition @@ -954,7 +954,7 @@ } ts = metadata.time_spec; - LOG(DEBUG) << "Received timestamp = " << ts.get_real_secs(); + LOGC(DDEV, DEBUG) << "Received timestamp = " << ts.get_real_secs(); for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->write((short *) &pkt_bufs[i].front(), @@ -963,8 +963,8 @@ // Continue on local overrun, exit on other errors if ((rc < 0)) { - LOG(ERR) << rx_buffers[i]->str_code(rc); - LOG(ERR) << rx_buffers[i]->str_status(timestamp); + LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc); + LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp); if (rc != smpl_buf::ERROR_OVERFLOW) return 0; } @@ -975,8 +975,8 @@ for (size_t i = 0; i < rx_buffers.size(); i++) { rc = rx_buffers[i]->read(bufs[i], len, timestamp); if ((rc < 0) || (rc != len)) { - LOG(ERR) << rx_buffers[i]->str_code(rc); - LOG(ERR) << rx_buffers[i]->str_status(timestamp); + LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc); + LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp); return 0; } } @@ -997,12 +997,12 @@ // No control packets if (isControl) { - LOG(ERR) << "Control packets not supported"; + LOGC(DDEV, ERR) << "Control packets not supported"; return 0; } if (bufs.size() != chans) { - LOG(ALERT) << "Invalid channel combination " << bufs.size(); + LOGC(DDEV, ALERT) << "Invalid channel combination " << bufs.size(); return -1; } @@ -1011,14 +1011,14 @@ drop_cnt++; if (drop_cnt == 1) { - LOG(DEBUG) << "Aligning transmitter: stop burst"; + LOGC(DDEV, DEBUG) << "Aligning transmitter: stop burst"; *underrun = true; metadata.end_of_burst = true; } else if (drop_cnt < 30) { - LOG(DEBUG) << "Aligning transmitter: packet advance"; + LOGC(DDEV, DEBUG) << "Aligning transmitter: packet advance"; return len; } else { - LOG(DEBUG) << "Aligning transmitter: start burst"; + LOGC(DDEV, DEBUG) << "Aligning transmitter: start burst"; metadata.start_of_burst = true; aligned = true; drop_cnt = 0; @@ -1030,7 +1030,7 @@ thread_enable_cancel(true); if (num_smpls != (unsigned) len) { - LOG(ALERT) << "UHD: Device send timed out"; + LOGC(DDEV, ALERT) << "UHD: Device send timed out"; } return num_smpls; @@ -1066,7 +1066,7 @@ return uhd::tune_request_t(freq, lo_offset); } else if ((dev_type != B210) || (chans > 2) || (chan > 1)) { - LOG(ALERT) << chans << " channels unsupported"; + LOGC(DDEV, ALERT) << chans << " channels unsupported"; return treq; } @@ -1082,7 +1082,7 @@ /* Find center frequency between channels */ rf_spread = fabs(freqs[!chan] - freq); if (rf_spread > dev_param_map.at(dev_key(B210, tx_sps, rx_sps)).mcr) { - LOG(ALERT) << rf_spread << "Hz tuning spread not supported\n"; + LOGC(DDEV, ALERT) << rf_spread << "Hz tuning spread not supported\n"; return treq; } @@ -1108,7 +1108,7 @@ tres = usrp_dev->set_rx_freq(treq, chan); rx_freqs[chan] = usrp_dev->get_rx_freq(chan); } - LOG(INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; if ((chans == 1) || ((chans == 2) && dev_type == UMTRX)) return true; @@ -1128,7 +1128,7 @@ rx_freqs[!chan] = usrp_dev->get_rx_freq(!chan); } - LOG(INFO) << "\n" << tres.to_pp_string() << std::endl; + LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl; } return true; @@ -1137,7 +1137,7 @@ bool uhd_device::setTxFreq(double wFreq, size_t chan) { if (chan >= tx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } ScopedLock lock(tune_lock); @@ -1148,7 +1148,7 @@ bool uhd_device::setRxFreq(double wFreq, size_t chan) { if (chan >= rx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } ScopedLock lock(tune_lock); @@ -1159,7 +1159,7 @@ double uhd_device::getTxFreq(size_t chan) { if (chan >= tx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0; } @@ -1169,7 +1169,7 @@ double uhd_device::getRxFreq(size_t chan) { if (chan >= rx_freqs.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0; } @@ -1180,23 +1180,23 @@ { std::vector avail; if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } avail = usrp_dev->get_rx_antennas(chan); if (std::find(avail.begin(), avail.end(), ant) == avail.end()) { - LOG(ALERT) << "Requested non-existent Rx antenna " << ant << " on channel " << chan; - LOG(INFO) << "Available Rx antennas: "; + LOGC(DDEV, ALERT) << "Requested non-existent Rx antenna " << ant << " on channel " << chan; + LOGC(DDEV, INFO) << "Available Rx antennas: "; for (std::vector::const_iterator i = avail.begin(); i != avail.end(); ++i) - LOG(INFO) << "- '" << *i << "'"; + LOGC(DDEV, INFO) << "- '" << *i << "'"; return false; } usrp_dev->set_rx_antenna(ant, chan); rx_paths[chan] = usrp_dev->get_rx_antenna(chan); if (ant != rx_paths[chan]) { - LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << rx_paths[chan]; + LOGC(DDEV, ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << rx_paths[chan]; return false; } @@ -1206,7 +1206,7 @@ std::string uhd_device::getRxAntenna(size_t chan) { if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } return usrp_dev->get_rx_antenna(chan); @@ -1216,23 +1216,23 @@ { std::vector avail; if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } avail = usrp_dev->get_tx_antennas(chan); if (std::find(avail.begin(), avail.end(), ant) == avail.end()) { - LOG(ALERT) << "Requested non-existent Tx antenna " << ant << " on channel " << chan; - LOG(INFO) << "Available Tx antennas: "; + LOGC(DDEV, ALERT) << "Requested non-existent Tx antenna " << ant << " on channel " << chan; + LOGC(DDEV, INFO) << "Available Tx antennas: "; for (std::vector::const_iterator i = avail.begin(); i != avail.end(); ++i) - LOG(INFO) << "- '" << *i << "'"; + LOGC(DDEV, INFO) << "- '" << *i << "'"; return false; } usrp_dev->set_tx_antenna(ant, chan); tx_paths[chan] = usrp_dev->get_tx_antenna(chan); if (ant != tx_paths[chan]) { - LOG(ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << tx_paths[chan]; + LOGC(DDEV, ALERT) << "Failed setting antenna " << ant << " on channel " << chan << ", got instead " << tx_paths[chan]; return false; } @@ -1242,7 +1242,7 @@ std::string uhd_device::getTxAntenna(size_t chan) { if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } return usrp_dev->get_tx_antenna(chan); @@ -1310,7 +1310,7 @@ if ((md.event_code != uhd::async_metadata_t::EVENT_CODE_UNDERFLOW) && (md.event_code != uhd::async_metadata_t::EVENT_CODE_TIME_ERROR)) { - LOG(ERR) << str_code(md); + LOGC(DDEV, ERR) << str_code(md); } } @@ -1470,15 +1470,15 @@ return ERROR_TIMESTAMP; if (timestamp < time_end) { - LOG(ERR) << "Overwriting old buffer data: timestamp="<fpga_master_clock_freq() != masterClockRate) { - LOG(ALERT) << "WRONG FPGA clock freq = " << m_uRx->fpga_master_clock_freq() + LOGC(DDEV, ALERT) << "WRONG FPGA clock freq = " << m_uRx->fpga_master_clock_freq() << ", desired clock freq = " << masterClockRate; m_uRx.reset(); return -1; @@ -132,14 +132,14 @@ } catch(...) { - LOG(ALERT) << "make failed on Tx"; + LOGC(DDEV, ALERT) << "make failed on Tx"; m_uTx.reset(); return -1; } if (m_uTx->fpga_master_clock_freq() != masterClockRate) { - LOG(ALERT) << "WRONG FPGA clock freq = " << m_uTx->fpga_master_clock_freq() + LOGC(DDEV, ALERT) << "WRONG FPGA clock freq = " << m_uTx->fpga_master_clock_freq() << ", desired clock freq = " << masterClockRate; m_uTx.reset(); return -1; @@ -186,7 +186,7 @@ bool USRPDevice::start() { - LOG(INFO) << "starting USRP..."; + LOGC(DDEV, INFO) << "starting USRP..."; #ifndef SWLOOPBACK if (!m_uRx && !skipRx) return false; if (!m_uTx) return false; @@ -270,7 +270,7 @@ double USRPDevice::setTxGain(double dB, size_t chan) { if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return 0.0; } @@ -280,10 +280,10 @@ if (dB < minTxGain()) dB = minTxGain(); - LOG(NOTICE) << "Setting TX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "Setting TX gain to " << dB << " dB."; if (!m_dbTx->set_gain(dB)) - LOG(ERR) << "Error setting TX gain"; + LOGC(DDEV, ERR) << "Error setting TX gain"; writeLock.unlock(); @@ -294,7 +294,7 @@ double USRPDevice::setRxGain(double dB, size_t chan) { if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return 0.0; } @@ -306,10 +306,10 @@ if (dB < minRxGain()) dB = minRxGain(); - LOG(NOTICE) << "Setting RX gain to " << dB << " dB."; + LOGC(DDEV, NOTICE) << "Setting RX gain to " << dB << " dB."; if (!m_dbRx->set_gain(dB)) - LOG(ERR) << "Error setting RX gain"; + LOGC(DDEV, ERR) << "Error setting RX gain"; writeLock.unlock(); @@ -319,40 +319,40 @@ bool USRPDevice::setRxAntenna(const std::string &ant, size_t chan) { if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return true; } std::string USRPDevice::getRxAntenna(size_t chan) { if (chan >= rx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return ""; } bool USRPDevice::setTxAntenna(const std::string &ant, size_t chan) { if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return false; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return true; } std::string USRPDevice::getTxAntenna(size_t chan) { if (chan >= tx_paths.size()) { - LOG(ALERT) << "Requested non-existent channel " << chan; + LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return ""; } - LOG(ALERT) << "Not implemented"; + LOGC(DDEV, ALERT) << "Not implemented"; return ""; } @@ -405,11 +405,11 @@ uint32_t word0 = usrp_to_host_u32(tmpBuf[0]); uint32_t chan = (word0 >> 16) & 0x1f; unsigned payloadSz = word0 & 0x1ff; - LOG(DEBUG) << "first two bytes: " << hex << word0 << " " << dec << pktTimestamp; + LOGC(DDEV, DEBUG) << "first two bytes: " << hex << word0 << " " << dec << pktTimestamp; bool incrementHi32 = ((lastPktTimestamp & 0x0ffffffffll) > pktTimestamp); if (incrementHi32 && (timeStart!=0)) { - LOG(DEBUG) << "high 32 increment!!!"; + LOGC(DDEV, DEBUG) << "high 32 increment!!!"; hi32Timestamp++; } pktTimestamp = (((TIMESTAMP) hi32Timestamp) << 32) | pktTimestamp; @@ -421,19 +421,19 @@ if ((word2 >> 16) == ((0x01 << 8) | 0x02)) { timestamp -= timestampOffset; timestampOffset = pktTimestamp - pingTimestamp + pingOffset; - LOG(DEBUG) << "updating timestamp offset to: " << timestampOffset; + LOGC(DDEV, DEBUG) << "updating timestamp offset to: " << timestampOffset; timestamp += timestampOffset; isAligned = true; } continue; } if (chan != 0) { - LOG(DEBUG) << "chan: " << chan << ", timestamp: " << pktTimestamp << ", sz:" << payloadSz; + LOGC(DDEV, DEBUG) << "chan: " << chan << ", timestamp: " << pktTimestamp << ", sz:" << payloadSz; continue; } if ((word0 >> 28) & 0x04) { if (underrun) *underrun = true; - LOG(DEBUG) << "UNDERRUN in TRX->USRP interface"; + LOGC(DDEV, DEBUG) << "UNDERRUN in TRX->USRP interface"; } if (RSSI) *RSSI = (word0 >> 21) & 0x3f; @@ -454,7 +454,7 @@ if (pktTimestamp + payloadSz/2/sizeof(short) > timeEnd) timeEnd = pktTimestamp+payloadSz/2/sizeof(short); - LOG(DEBUG) << "timeStart: " << timeStart << ", timeEnd: " << timeEnd << ", pktTimestamp: " << pktTimestamp; + LOGC(DDEV, DEBUG) << "timeStart: " << timeStart << ", timeEnd: " << timeEnd << ", pktTimestamp: " << pktTimestamp; } } @@ -462,14 +462,14 @@ // copy desired data to buf unsigned bufStart = dataStart+(timestamp-timeStart); if (bufStart + len < currDataSize/2) { - LOG(DEBUG) << "bufStart: " << bufStart; + LOGC(DDEV, DEBUG) << "bufStart: " << bufStart; memcpy(buf,data+bufStart*2,len*2*sizeof(short)); memset(data+bufStart*2,0,len*2*sizeof(short)); } else { - LOG(DEBUG) << "len: " << len << ", currDataSize/2: " << currDataSize/2 << ", bufStart: " << bufStart; + LOGC(DDEV, DEBUG) << "len: " << len << ", currDataSize/2: " << currDataSize/2 << ", bufStart: " << bufStart; unsigned firstLength = (currDataSize/2-bufStart); - LOG(DEBUG) << "firstLength: " << firstLength; + LOGC(DDEV, DEBUG) << "firstLength: " << firstLength; memcpy(buf,data+bufStart*2,firstLength*2*sizeof(short)); memset(data+bufStart*2,0,firstLength*2*sizeof(short)); memcpy(buf+firstLength*2,data,(len-firstLength)*2*sizeof(short)); @@ -599,19 +599,19 @@ usrp_tune_result result; if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return false; } if (m_uTx->tune(txSubdevSpec.side, m_dbTx, wFreq, &result)) { - LOG(INFO) << "set TX: " << wFreq << std::endl + LOGC(DDEV, INFO) << "set TX: " << wFreq << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; return true; } else { - LOG(ALERT) << "set TX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set TX: " << wFreq << "failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; @@ -624,19 +624,19 @@ usrp_tune_result result; if (chan) { - LOG(ALERT) << "Invalid channel " << chan; + LOGC(DDEV, ALERT) << "Invalid channel " << chan; return false; } if (m_uRx->tune(0, m_dbRx, wFreq, &result)) { - LOG(INFO) << "set RX: " << wFreq << std::endl + LOGC(DDEV, INFO) << "set RX: " << wFreq << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; return true; } else { - LOG(ALERT) << "set RX: " << wFreq << "failed" << std::endl + LOGC(DDEV, ALERT) << "set RX: " << wFreq << "failed" << std::endl << " baseband freq: " << result.baseband_freq << std::endl << " DDC freq: " << result.dxc_freq << std::endl << " residual freq: " << result.residual_freq; @@ -656,15 +656,15 @@ const std::vector& rx_paths) { if (tx_sps != rx_sps) { - LOG(ERROR) << "USRP1 requires tx_sps == rx_sps"; + LOGC(DDEV, ERROR) << "USRP1 requires tx_sps == rx_sps"; return NULL; } if (chans != 1) { - LOG(ERROR) << "USRP1 supports only 1 channel"; + LOGC(DDEV, ERROR) << "USRP1 supports only 1 channel"; return NULL; } if (lo_offset != 0.0) { - LOG(ERROR) << "USRP1 doesn't support lo_offset"; + LOGC(DDEV, ERROR) << "USRP1 doesn't support lo_offset"; return NULL; } return new USRPDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); -- To view, visit https://gerrit.osmocom.org/10496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I844fe4a75bf277cd3cc5bd8fa06e06ad97b2ea95 Gerrit-Change-Number: 10496 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 18 07:13:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 18 Aug 2018 07:13:30 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_clck.c: fix time delta calculations In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10489 ) Change subject: trxcon/sched_clck.c: fix time delta calculations ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 18 Aug 2018 07:13:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 18 07:13:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 18 Aug 2018 07:13:31 +0000 Subject: Change in osmocom-bb[master]: trxcon/sched_clck.c: fix time delta calculations In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10489 ) Change subject: trxcon/sched_clck.c: fix time delta calculations ...................................................................... trxcon/sched_clck.c: fix time delta calculations Use osmo_clock_gettime() to read the monotonic clock instead of gettimeofday() which could drift backwards. This requires switching the scheduler clock from struct timeval to struct timespec. Expand some variables to 64 bits in order to keep types used in calculations compatible. The previous implementation unconditionally subtracted microsecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() for the subtraction instead which accounts for fractions of a second correctly. Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Related: OS#3467 --- M src/host/trxcon/sched_clck.c M src/host/trxcon/scheduler.h 2 files changed, 31 insertions(+), 35 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve; Verified Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 59cffb2..56b89a2 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -27,12 +27,15 @@ #include #include #include +#include #include #include #include #include #include +#include +#include #include #include "scheduler.h" @@ -47,8 +50,9 @@ static void sched_clck_tick(void *data) { struct trx_sched *sched = (struct trx_sched *) data; - struct timeval tv_now, *tv_clock; - int32_t elapsed; + struct timespec tv_now, *tv_clock, elapsed; + int64_t elapsed_us; + const struct timespec frame_duration = { .tv_sec = 0, .tv_nsec = FRAME_DURATION_uS * 1000 }; /* Check if transceiver is still alive */ if (sched->fn_counter_lost++ == TRX_LOSS_FRAMES) { @@ -59,16 +63,16 @@ } /* Get actual / previous frame time */ - gettimeofday(&tv_now, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); tv_clock = &sched->clock; - elapsed = (tv_now.tv_sec - tv_clock->tv_sec) * 1000000 - + (tv_now.tv_usec - tv_clock->tv_usec); + timespecsub(&tv_now, tv_clock, &elapsed); + elapsed_us = (elapsed.tv_sec * 1000000) + (elapsed.tv_nsec / 1000); /* If someone played with clock, or if the process stalled */ - if (elapsed > FRAME_DURATION_uS * MAX_FN_SKEW || elapsed < 0) { + if (elapsed_us > FRAME_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) { LOGP(DSCH, LOGL_NOTICE, "PC clock skew: " - "elapsed uS %d\n", elapsed); + "elapsed uS %" PRId64 "\n", elapsed_us); sched->state = SCH_CLCK_STATE_WAIT; @@ -76,14 +80,9 @@ } /* Schedule next FN clock */ - while (elapsed > FRAME_DURATION_uS / 2) { - tv_clock->tv_usec += FRAME_DURATION_uS; - elapsed -= FRAME_DURATION_uS; - - if (tv_clock->tv_usec >= 1000000) { - tv_clock->tv_sec++; - tv_clock->tv_usec -= 1000000; - } + while (elapsed_us > FRAME_DURATION_uS / 2) { + timespecadd(tv_clock, &frame_duration, tv_clock); + elapsed_us -= FRAME_DURATION_uS; sched->fn_counter_proc = (sched->fn_counter_proc + 1) % GSM_HYPERFRAME; @@ -94,11 +93,11 @@ } osmo_timer_schedule(&sched->clock_timer, 0, - FRAME_DURATION_uS - elapsed); + FRAME_DURATION_uS - elapsed_us); } static void sched_clck_correct(struct trx_sched *sched, - struct timeval *tv_now, uint32_t fn) + struct timespec *tv_now, uint32_t fn) { sched->fn_counter_proc = fn; @@ -107,7 +106,7 @@ sched->clock_cb(sched); /* Schedule first FN clock */ - memcpy(&sched->clock, tv_now, sizeof(struct timeval)); + sched->clock = *tv_now; memset(&sched->clock_timer, 0, sizeof(sched->clock_timer)); sched->clock_timer.cb = sched_clck_tick; @@ -117,14 +116,14 @@ int sched_clck_handle(struct trx_sched *sched, uint32_t fn) { - struct timeval tv_now, *tv_clock; - int32_t elapsed, elapsed_fn; + struct timespec tv_now, *tv_clock, elapsed; + int64_t elapsed_us, elapsed_fn; /* Reset lost counter */ sched->fn_counter_lost = 0; /* Get actual / previous frame time */ - gettimeofday(&tv_now, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); tv_clock = &sched->clock; /* If this is the first CLCK IND */ @@ -142,8 +141,8 @@ osmo_timer_del(&sched->clock_timer); /* Calculate elapsed time / frames since last processed fn */ - elapsed = (tv_now.tv_sec - tv_clock->tv_sec) * 1000000 - + (tv_now.tv_usec - tv_clock->tv_usec); + timespecsub(&tv_now, tv_clock, &elapsed); + elapsed_us = (elapsed.tv_sec * 1000000) + (elapsed.tv_nsec / 1000); elapsed_fn = (fn + GSM_HYPERFRAME - sched->fn_counter_proc) % GSM_HYPERFRAME; @@ -159,23 +158,20 @@ return 0; } - LOGP(DSCH, LOGL_INFO, "GSM clock jitter: %d\n", - elapsed_fn * FRAME_DURATION_uS - elapsed); + LOGP(DSCH, LOGL_INFO, "GSM clock jitter: %" PRId64 "\n", + elapsed_fn * FRAME_DURATION_uS - elapsed_us); /* Too many frames have been processed already */ if (elapsed_fn < 0) { + struct timespec duration; /** * Set clock to the time or last FN should * have been transmitted */ - tv_clock->tv_sec = tv_now.tv_sec; - tv_clock->tv_usec = tv_now.tv_usec + - (0 - elapsed_fn) * FRAME_DURATION_uS; - - if (tv_clock->tv_usec >= 1000000) { - tv_clock->tv_sec++; - tv_clock->tv_usec -= 1000000; - } + duration.tv_nsec = (0 - elapsed_fn) * FRAME_DURATION_uS * 1000; + duration.tv_sec = duration.tv_nsec / 1000000000; + duration.tv_nsec = duration.tv_nsec % 1000000000; + timespecadd(&tv_now, &duration, tv_clock); /* Set time to the time our next FN has to be transmitted */ osmo_timer_schedule(&sched->clock_timer, 0, @@ -195,7 +191,7 @@ } /* Schedule next FN to be transmitted */ - memcpy(tv_clock, &tv_now, sizeof(struct timeval)); + *tv_clock = tv_now; osmo_timer_schedule(&sched->clock_timer, 0, FRAME_DURATION_uS); return 0; diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index f36c3b2..6c3a2f2 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -21,7 +21,7 @@ /*! \brief Clock state */ uint8_t state; /*! \brief Local clock source */ - struct timeval clock; + struct timespec clock; /*! \brief Count of processed frames */ uint32_t fn_counter_proc; /*! \brief Local frame counter advance */ -- To view, visit https://gerrit.osmocom.org/10489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic93f90685c6d6dc28dfc4ad48c998e0eac113cf8 Gerrit-Change-Number: 10489 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Aug 18 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 18 Aug 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#219?= In-Reply-To: <1459666544.20.1534518607761.JavaMail.jenkins@jenkins.osmocom.org> References: <1459666544.20.1534518607761.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1871002663.1.1534605007458.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Aug 18 15:29:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 18 Aug 2018 15:29:10 +0000 Subject: Change in docker-playground[master]: cgit: Fix group membership to allow read of git repos Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10516 Change subject: cgit: Fix group membership to allow read of git repos ...................................................................... cgit: Fix group membership to allow read of git repos Change-Id: I14372fbf63429a2dc7c78c60c7a1eda10791bd0c --- M cgit/Dockerfile 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/16/10516/1 diff --git a/cgit/Dockerfile b/cgit/Dockerfile index c7d2640..4cf494a 100644 --- a/cgit/Dockerfile +++ b/cgit/Dockerfile @@ -12,3 +12,6 @@ COPY osmo-commit-filter.py /usr/local/lib/cgit/filters/osmo-commit-filter.py COPY syntax-highlighting.py /usr/local/lib/cgit/filters/syntax-highlighting.py + +RUN useradd -u 30001 -g ssh git-daemon +RUN usermod -a -G 101 www-data -- To view, visit https://gerrit.osmocom.org/10516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I14372fbf63429a2dc7c78c60c7a1eda10791bd0c Gerrit-Change-Number: 10516 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 18 15:29:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 18 Aug 2018 15:29:31 +0000 Subject: Change in docker-playground[master]: cgit: Fix group membership to allow read of git repos In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10516 ) Change subject: cgit: Fix group membership to allow read of git repos ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I14372fbf63429a2dc7c78c60c7a1eda10791bd0c Gerrit-Change-Number: 10516 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sat, 18 Aug 2018 15:29:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 18 15:29:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 18 Aug 2018 15:29:32 +0000 Subject: Change in docker-playground[master]: cgit: Fix group membership to allow read of git repos In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10516 ) Change subject: cgit: Fix group membership to allow read of git repos ...................................................................... cgit: Fix group membership to allow read of git repos Change-Id: I14372fbf63429a2dc7c78c60c7a1eda10791bd0c --- M cgit/Dockerfile 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/cgit/Dockerfile b/cgit/Dockerfile index c7d2640..4cf494a 100644 --- a/cgit/Dockerfile +++ b/cgit/Dockerfile @@ -12,3 +12,6 @@ COPY osmo-commit-filter.py /usr/local/lib/cgit/filters/osmo-commit-filter.py COPY syntax-highlighting.py /usr/local/lib/cgit/filters/syntax-highlighting.py + +RUN useradd -u 30001 -g ssh git-daemon +RUN usermod -a -G 101 www-data -- To view, visit https://gerrit.osmocom.org/10516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I14372fbf63429a2dc7c78c60c7a1eda10791bd0c Gerrit-Change-Number: 10516 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sat Aug 18 20:10:49 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Aug 2018 20:10:49 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b787d5481783_1e08db068c655381@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/armv7l Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: build on obs-arm-3:3 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 18 20:14:49 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Aug 2018 20:14:49 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b787e4729020_1e08db068c656369@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/armv7l Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: build on obs-arm-3:8 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 18 20:29:40 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Aug 2018 20:29:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-fl2k in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7881cab66be_1e08db068c659113@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-fl2k/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-fl2k failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-fl2k Last lines of build log: build on obs-arm-4:10 did not create a logfile gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 18 20:39:06 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Aug 2018 20:39:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7884032bd33_1e08db068c660429@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: build on obs-arm-1:11 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 18 21:13:06 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Aug 2018 21:13:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b788bf94c48b_1e08db068c66466a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 15s] [1/1] preinstalling libdevmapper1.02.1... [ 15s] copying packages... [ 21s] reordering...cycle: libc6 -> libgcc1 [ 21s] breaking dependency libgcc1 -> libc6 [ 21s] cycle: dh-python -> python3 [ 21s] breaking dependency python3 -> dh-python [ 21s] cycle: debhelper -> dh-autoreconf [ 21s] breaking dependency debhelper -> dh-autoreconf [ 21s] cycle: dh-strip-nondeterminism -> debhelper [ 21s] breaking dependency debhelper -> dh-strip-nondeterminism [ 21s] done [ 21s] objdump: /boot/Image.guest32: File format not recognized [ 21s] Warning: cross compile not possible due to missing static binaries. please install build-initvm package for that purpose. [ 21s] check that the right architecture is available for your build host, you need initvm.armv8l for this one. [ 21s] booting kvm... [ 21s] ### VM INTERACTION START ### [ 21s] mkfifo: cannot create fifo '/var/cache/obs/worker/root_23/root.qemu/monitor': File exists [ 21s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host,aarch64=off -M virt,gic-version=host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -mem-prealloc -mem-path /dev/hugepages -net none -kernel /boot/Image.guest32 -initrd /boot/initrd.guest32 -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyAMA0 init=/.build/build -m 9216 -drive file=/var/cache/obs/worker/root_23/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_23/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_23/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 21s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_23/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 21s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_23/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 327s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_23/root: 61592 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 6866 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/23/build/build-vm: line 462: kill: (61585) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 18 21:18:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Aug 2018 21:18:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b788d2899b6e_1e08db068c6652cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: build on obs-arm-4:10 did not create a logfile gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat Aug 18 21:38:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 18 Aug 2018 21:38:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7891d5a92a0_1e08db068c668129@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: build on obs-arm-4:9 did not create a logfile gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 19 04:39:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Aug 2018 04:39:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b78f4854cba3_1e08db068c797182@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 53s] [184/205] installing login-1:4.2-3 [ 53s] Processing triggers for man-db (2.7.0.2-5) ... [ 53s] [185/205] installing libblkid1-2.25.2-6 [ 54s] Processing triggers for libc-bin (2.19-18) ... [ 54s] [186/205] installing user-setup-1.61 [ 54s] [187/205] installing libcryptsetup4-2:1.6.6-5 [ 54s] Processing triggers for libc-bin (2.19-18) ... [ 54s] [188/205] installing base-files-8 [ 54s] Processing triggers for man-db (2.7.0.2-5) ... [ 54s] [189/205] installing libmount1-2.25.2-6 [ 54s] Processing triggers for libc-bin (2.19-18) ... [ 54s] [190/205] installing mount-2.25.2-6 [ 54s] Processing triggers for man-db (2.7.0.2-5) ... [ 55s] [191/205] installing bash-4.3-11+b1 [ 55s] update-alternatives: using /usr/share/man/man7/bash-builtins.7.gz to provide /usr/share/man/man7/builtins.7.gz (builtins.7.gz) in auto mode [ 55s] Processing triggers for man-db (2.7.0.2-5) ... [ 55s] [192/205] installing dpkg-dev-1.17.25 [ 55s] Processing triggers for man-db (2.7.0.2-5) ... [ 56s] [193/205] installing build-essential-11.7 [ 56s] [194/205] installing initscripts-2.88dsf-59 [ 57s] /usr/sbin/invoke-rc.d: 1: /usr/sbin/invoke-rc.d: /sbin/runlevel: not found [ 57s] Processing triggers for man-db (2.7.0.2-5) ... [28864s] qemu-system-x86_64: terminating on signal 15 from pid 10615 () Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [28864s] ### VM INTERACTION END ### [28864s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28864s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sun Aug 19 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 19 Aug 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#220?= In-Reply-To: <1871002663.1.1534605007458.JavaMail.jenkins@jenkins.osmocom.org> References: <1871002663.1.1534605007458.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <31585435.14.1534691407035.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Aug 19 15:13:27 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sun, 19 Aug 2018 15:13:27 +0000 Subject: Change in osmo-sip-connector[master]: Logging: in check_rtp_create() log the IP address in human readable d... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10490 to look at the new patch set (#2). Change subject: Logging: in check_rtp_create() log the IP address in human readable dotted quad format. ...................................................................... Logging: in check_rtp_create() log the IP address in human readable dotted quad format. Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 --- M src/mncc.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/90/10490/2 -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 19 15:16:19 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sun, 19 Aug 2018 15:16:19 +0000 Subject: Change in osmo-sip-connector[master]: Logging: in check_rtp_create() log the IP address in human readable d... In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10490 ) Change subject: Logging: in check_rtp_create() log the IP address in human readable dotted quad format. ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/10490/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/10490/2/src/mncc.c at 383 PS2, Line 383: struct in_addr net = { .s_addr = htonl(leg->base.ip) }; On my x86 system, ntonl() and ntohl() are both macros to __byteswap32() other systems may be different, so this is better. I should also change other occurences in another patch. -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 19 Aug 2018 15:16:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 19 21:25:30 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 19 Aug 2018 21:25:30 +0000 Subject: Change in osmocom-bb[master]: Allow lua code to register a fd for reading with the runtime In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10439 to look at the new patch set (#2). Change subject: Allow lua code to register a fd for reading with the runtime ...................................................................... Allow lua code to register a fd for reading with the runtime To have bi-directional communication we can pass credentials to the registry server and now we can register a callback when the registry is sending data to us. The callback needs to return if the fd should continue to be selected as I found no way to push the userdata as parameter on the stack. Lua code will look like: local host, port = "www.osmocom.org", 80 local tcp = socket.tcp() tcp:connect(host, port); tcp:send("GET / HTTP/1.0\r\n\r\n"); local cb = function() local s, status, partial = tcp:receive() print(s) if status == 'closed' then tcp:close() return 0 end return 1 end local foo = osmo.register_fd(tcp:getfd(), cb) Change-Id: I8254bdda1df2f8fe0a5eac894b931e7de5b426df --- M src/host/layer23/src/mobile/script_lua.c 1 file changed, 103 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/10439/2 -- To view, visit https://gerrit.osmocom.org/10439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8254bdda1df2f8fe0a5eac894b931e7de5b426df Gerrit-Change-Number: 10439 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 19 21:36:31 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 19 Aug 2018 21:36:31 +0000 Subject: Change in osmocom-bb[master]: Forget about the callback after use and cancellation Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10536 Change subject: Forget about the callback after use and cancellation ...................................................................... Forget about the callback after use and cancellation Don't try to unref something else after we have given up our spot in the table. Change-Id: I4e8db297e816d3d07a46147d5d3bdc0e8fae6c9a --- M src/host/layer23/src/mobile/script_lua.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/10536/1 diff --git a/src/host/layer23/src/mobile/script_lua.c b/src/host/layer23/src/mobile/script_lua.c index 4cfe55a..088aab3 100644 --- a/src/host/layer23/src/mobile/script_lua.c +++ b/src/host/layer23/src/mobile/script_lua.c @@ -136,6 +136,7 @@ lua_rawgeti(L, LUA_REGISTRYINDEX, timer->cb_ref); luaL_unref(L, LUA_REGISTRYINDEX, timer->cb_ref); + timer->cb_ref = LUA_NOREF; err = lua_pcall(L, 0, 0, 0); if (err) { @@ -276,6 +277,10 @@ luaL_argcheck(L, lua_isuserdata(L, -1), 1, "No userdata"); timer = lua_touserdata(L, -1); + if (timer->cb_ref != LUA_NOREF) { + luaL_unref(L, LUA_REGISTRYINDEX, timer->cb_ref); + timer->cb_ref = LUA_NOREF; + } prim = mobile_prim_alloc(PRIM_MOB_TIMER_CANCEL, PRIM_OP_REQUEST); prim->u.timer.timer_id = (intptr_t) timer; -- To view, visit https://gerrit.osmocom.org/10536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4e8db297e816d3d07a46147d5d3bdc0e8fae6c9a Gerrit-Change-Number: 10536 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Aug 19 21:49:44 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Aug 2018 21:49:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b79e60e2d83c_1e08db068c99547@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: build on obs-arm-4:30 did not create a logfile gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 19 22:25:44 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 19 Aug 2018 22:25:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b79ee7a71d5f_1e08db068c100557a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 14s] [71/71] preinstalling initscripts... [ 14s] [ 14s] [1/1] preinstalling libdevmapper1.02.1... [ 14s] copying packages... [ 18s] reordering...cycle: libc6 -> libgcc1 [ 18s] breaking dependency libgcc1 -> libc6 [ 18s] cycle: debhelper -> dh-autoreconf [ 18s] breaking dependency debhelper -> dh-autoreconf [ 18s] cycle: dh-strip-nondeterminism -> debhelper [ 18s] breaking dependency debhelper -> dh-strip-nondeterminism [ 18s] done [ 18s] objdump: /boot/Image.guest32: File format not recognized [ 18s] Warning: cross compile not possible due to missing static binaries. please install build-initvm package for that purpose. [ 18s] check that the right architecture is available for your build host, you need initvm.armv8l for this one. [ 19s] booting kvm... [ 19s] ### VM INTERACTION START ### [ 19s] mkfifo: cannot create fifo '/var/cache/obs/worker/root_6/root.qemu/monitor': File exists [ 19s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host,aarch64=off -M virt,gic-version=host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -mem-prealloc -mem-path /dev/hugepages -net none -kernel /boot/Image.guest32 -initrd /boot/initrd.guest32 -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyAMA0 init=/.build/build -m 9216 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 19s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 19s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 329s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_6/root: 12618 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 43733 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/6/build/build-vm: line 462: kill: (12609) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Mon Aug 20 00:01:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 20 Aug 2018 00:01:54 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_oct+?= =?UTF-8?Q?trx,master,default,osmocom-master-debian9_#1043?= Message-ID: <1809044530.24.1534723314843.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 41.71 KB...] checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.12.0.27-8ce6 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc64gen.c GEN crc16gen.c GEN crc32gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_clockgettime.lo CC timer_gettimeofday.lo CC select.lo CC signal.lo CC msgb.lo CC bits.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo /bin/bash: line 2: 20396 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT crc16.lo -MD -MP -MF $depbase.Tpo -c -o crc16.lo crc16.c Makefile:548: recipe for target 'crc16.lo' failed make[3]: *** [crc16.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:652: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:604: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Aug 20 00:49:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 20 Aug 2018 00:49:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB?= =?UTF-8?Q?_oct+trx,master,default,osmocom-master-debian9_#1044?= In-Reply-To: <1809044530.24.1534723314843.JavaMail.jenkins@jenkins.osmocom.org> References: <1809044530.24.1534723314843.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1123875313.26.1534726162892.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Aug 20 11:07:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 11:07:40 +0000 Subject: Change in libosmocore[master]: use __FILE__, not __BASE_FILE__ Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10537 Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: Ibc1d3746f1876ac42d6b1faf0e5f83bd2283cdcc --- M include/osmocom/core/fsm.h M include/osmocom/core/logging.h M include/osmocom/core/utils.h M include/osmocom/gsm/mncc.h M src/gb/gprs_ns.c 5 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/10537/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 9e1062f..54bbad5 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -178,7 +178,7 @@ */ #define osmo_fsm_inst_state_chg(fi, new_state, timeout_secs, T) \ _osmo_fsm_inst_state_chg(fi, new_state, timeout_secs, T, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) int _osmo_fsm_inst_state_chg(struct osmo_fsm_inst *fi, uint32_t new_state, unsigned long timeout_secs, int T, const char *file, int line); @@ -194,7 +194,7 @@ */ #define osmo_fsm_inst_state_chg_keep_timer(fi, new_state) \ _osmo_fsm_inst_state_chg_keep_timer(fi, new_state, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) int _osmo_fsm_inst_state_chg_keep_timer(struct osmo_fsm_inst *fi, uint32_t new_state, const char *file, int line); @@ -205,7 +205,7 @@ * purposes. See there for documentation. */ #define osmo_fsm_inst_dispatch(fi, event, data) \ - _osmo_fsm_inst_dispatch(fi, event, data, __BASE_FILE__, __LINE__) + _osmo_fsm_inst_dispatch(fi, event, data, __FILE__, __LINE__) int _osmo_fsm_inst_dispatch(struct osmo_fsm_inst *fi, uint32_t event, void *data, const char *file, int line); @@ -216,7 +216,7 @@ * See there for documentation. */ #define osmo_fsm_inst_term(fi, cause, data) \ - _osmo_fsm_inst_term(fi, cause, data, __BASE_FILE__, __LINE__) + _osmo_fsm_inst_term(fi, cause, data, __FILE__, __LINE__) void _osmo_fsm_inst_term(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause, void *data, const char *file, int line); @@ -228,7 +228,7 @@ * purposes. See there for documentation. */ #define osmo_fsm_inst_term_children(fi, cause, data) \ - _osmo_fsm_inst_term_children(fi, cause, data, __BASE_FILE__, __LINE__) + _osmo_fsm_inst_term_children(fi, cause, data, __FILE__, __LINE__) void _osmo_fsm_inst_term_children(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause, void *data, diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index e68f618..3cae63d 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -55,17 +55,17 @@ #define LOGPC(ss, level, fmt, args...) \ do { \ if (log_check_level(ss, level)) \ - logp2(ss, level, __BASE_FILE__, __LINE__, 1, fmt, ##args); \ + logp2(ss, level, __FILE__, __LINE__, 1, fmt, ##args); \ } while(0) /*! Log through the Osmocom logging framework with explicit source. - * If caller_file is passed as NULL, __BASE_FILE__ and __LINE__ are used + * If caller_file is passed as NULL, __FILE__ and __LINE__ are used * instead of caller_file and caller_line (so that this macro here defines * both cases in the same place, and to catch cases where callers fail to pass * a non-null filename string). * \param[in] ss logging subsystem (e.g. \ref DLGLOBAL) * \param[in] level logging level (e.g. \ref LOGL_NOTICE) - * \param[in] caller_file caller's source file string (e.g. __BASE_FILE__) + * \param[in] caller_file caller's source file string (e.g. __FILE__) * \param[in] caller_line caller's source line nr (e.g. __LINE__) * \param[in] fmt format string * \param[in] args variable argument list @@ -74,13 +74,13 @@ LOGPSRCC(ss, level, caller_file, caller_line, 0, fmt, ##args) /*! Log through the Osmocom logging framework with explicit source. - * If caller_file is passed as NULL, __BASE_FILE__ and __LINE__ are used + * If caller_file is passed as NULL, __FILE__ and __LINE__ are used * instead of caller_file and caller_line (so that this macro here defines * both cases in the same place, and to catch cases where callers fail to pass * a non-null filename string). * \param[in] ss logging subsystem (e.g. \ref DLGLOBAL) * \param[in] level logging level (e.g. \ref LOGL_NOTICE) - * \param[in] caller_file caller's source file string (e.g. __BASE_FILE__) + * \param[in] caller_file caller's source file string (e.g. __FILE__) * \param[in] caller_line caller's source line nr (e.g. __LINE__) * \param[in] cont continuation (1) or new line (0) * \param[in] fmt format string @@ -92,7 +92,7 @@ if (caller_file) \ logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ else \ - logp2(ss, level, __BASE_FILE__, __LINE__, cont, fmt, ##args); \ + logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ }\ } while(0) diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index dd4461c..e2d5134 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -78,7 +78,7 @@ */ #define OSMO_ASSERT(exp) \ if (!(exp)) { \ - osmo_panic("Assert failed %s %s:%d\n", #exp, __BASE_FILE__, __LINE__); \ + osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \ } /*! duplicate a string using talloc and release its prior content (if any) diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h index 6b94d46..7e7d12c 100644 --- a/include/osmocom/gsm/mncc.h +++ b/include/osmocom/gsm/mncc.h @@ -90,7 +90,7 @@ const uint8_t *msg, unsigned int len); #define osmo_mncc_log(ss, level, prefix, msg, len) \ - _osmo_mncc_log(ss, level, __BASE_FILE__, __LINE__, prefix, msg, len); + _osmo_mncc_log(ss, level, __FILE__, __LINE__, prefix, msg, len); extern const struct value_string osmo_mncc_names[]; static inline const char *osmo_mncc_name(uint32_t msg_type) { diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 75c3141..9b7cc05 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -87,8 +87,8 @@ #include "common_vty.h" -#define ns_set_state(ns_, st_) ns_set_state_with_log(ns_, st_, false, __BASE_FILE__, __LINE__) -#define ns_set_remote_state(ns_, st_) ns_set_state_with_log(ns_, st_, true, __BASE_FILE__, __LINE__) +#define ns_set_state(ns_, st_) ns_set_state_with_log(ns_, st_, false, __FILE__, __LINE__) +#define ns_set_remote_state(ns_, st_) ns_set_state_with_log(ns_, st_, true, __FILE__, __LINE__) #define ns_mark_blocked(ns_) ns_set_state(ns_, (ns_)->state | NSE_S_BLOCKED) #define ns_mark_unblocked(ns_) ns_set_state(ns_, (ns_)->state & (~NSE_S_BLOCKED)); -- To view, visit https://gerrit.osmocom.org/10537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc1d3746f1876ac42d6b1faf0e5f83bd2283cdcc Gerrit-Change-Number: 10537 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 11:07:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 11:07:46 +0000 Subject: Change in osmo-bsc[master]: use __FILE__, not __BASE_FILE__ Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10538 Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: Ic6d9dafc96c9d467ae53be2cd41adcf26a4e5125 --- M include/osmocom/bsc/bsc_subscriber.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/10538/1 diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index a7b3e53..93b3539 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -37,8 +37,8 @@ const char *file, int line); struct bsc_subscr *_bsc_subscr_put(struct bsc_subscr *bsub, const char *file, int line); -#define bsc_subscr_get(bsub) _bsc_subscr_get(bsub, __BASE_FILE__, __LINE__) -#define bsc_subscr_put(bsub) _bsc_subscr_put(bsub, __BASE_FILE__, __LINE__) +#define bsc_subscr_get(bsub) _bsc_subscr_get(bsub, __FILE__, __LINE__) +#define bsc_subscr_put(bsub) _bsc_subscr_put(bsub, __FILE__, __LINE__) void log_set_filter_bsc_subscr(struct log_target *target, struct bsc_subscr *bsub); -- To view, visit https://gerrit.osmocom.org/10538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6d9dafc96c9d467ae53be2cd41adcf26a4e5125 Gerrit-Change-Number: 10538 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 11:08:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 11:08:12 +0000 Subject: Change in osmo-msc[master]: use __FILE__, not __BASE_FILE__ Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10539 Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: I1c8122c909938daaf782468c1c5b0262d555c3ce --- M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/vlr.h 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/10539/1 diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 995b195..7b3702a 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -101,9 +101,9 @@ { return get_value_string(msc_subscr_conn_use_names, val); } #define msc_subscr_conn_get(conn, balance_token) \ - _msc_subscr_conn_get(conn, balance_token, __BASE_FILE__, __LINE__) + _msc_subscr_conn_get(conn, balance_token, __FILE__, __LINE__) #define msc_subscr_conn_put(conn, balance_token) \ - _msc_subscr_conn_put(conn, balance_token, __BASE_FILE__, __LINE__) + _msc_subscr_conn_put(conn, balance_token, __FILE__, __LINE__) struct gsm_subscriber_connection * _msc_subscr_conn_get(struct gsm_subscriber_connection *conn, enum msc_subscr_conn_use balance_token, diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 91c28db..386a548 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -326,19 +326,19 @@ const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub); #define vlr_subscr_find_by_imsi(vlr, imsi) \ - _vlr_subscr_find_by_imsi(vlr, imsi, __BASE_FILE__, __LINE__) + _vlr_subscr_find_by_imsi(vlr, imsi, __FILE__, __LINE__) #define vlr_subscr_find_or_create_by_imsi(vlr, imsi, created) \ _vlr_subscr_find_or_create_by_imsi(vlr, imsi, created, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) #define vlr_subscr_find_by_tmsi(vlr, tmsi) \ - _vlr_subscr_find_by_tmsi(vlr, tmsi, __BASE_FILE__, __LINE__) + _vlr_subscr_find_by_tmsi(vlr, tmsi, __FILE__, __LINE__) #define vlr_subscr_find_or_create_by_tmsi(vlr, tmsi, created) \ _vlr_subscr_find_or_create_by_tmsi(vlr, tmsi, created, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) #define vlr_subscr_find_by_msisdn(vlr, msisdn) \ - _vlr_subscr_find_by_msisdn(vlr, msisdn, __BASE_FILE__, __LINE__) + _vlr_subscr_find_by_msisdn(vlr, msisdn, __FILE__, __LINE__) struct vlr_subscr *_vlr_subscr_find_by_imsi(struct vlr_instance *vlr, const char *imsi, @@ -362,8 +362,8 @@ const char *msisdn, const char *file, int line); -#define vlr_subscr_get(sub) _vlr_subscr_get(sub, __BASE_FILE__, __LINE__) -#define vlr_subscr_put(sub) _vlr_subscr_put(sub, __BASE_FILE__, __LINE__) +#define vlr_subscr_get(sub) _vlr_subscr_get(sub, __FILE__, __LINE__) +#define vlr_subscr_put(sub) _vlr_subscr_put(sub, __FILE__, __LINE__) struct vlr_subscr *_vlr_subscr_get(struct vlr_subscr *sub, const char *file, int line); struct vlr_subscr *_vlr_subscr_put(struct vlr_subscr *sub, const char *file, int line); -- To view, visit https://gerrit.osmocom.org/10539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1c8122c909938daaf782468c1c5b0262d555c3ce Gerrit-Change-Number: 10539 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 11:08:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 11:08:28 +0000 Subject: Change in osmo-sgsn[master]: use __FILE__, not __BASE_FILE__ Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10540 Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: Icdf7af7a31fbba9197b3711eaf102fc0ae333bcc --- M include/osmocom/sgsn/gprs_subscriber.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/40/10540/1 diff --git a/include/osmocom/sgsn/gprs_subscriber.h b/include/osmocom/sgsn/gprs_subscriber.h index be78feb..d36db75 100644 --- a/include/osmocom/sgsn/gprs_subscriber.h +++ b/include/osmocom/sgsn/gprs_subscriber.h @@ -27,5 +27,5 @@ const char *file, int line); struct gprs_subscr *_gprs_subscr_put(struct gprs_subscr *gsub, const char *file, int line); -#define gprs_subscr_get(gsub) _gprs_subscr_get(gsub, __BASE_FILE__, __LINE__) -#define gprs_subscr_put(gsub) _gprs_subscr_put(gsub, __BASE_FILE__, __LINE__) +#define gprs_subscr_get(gsub) _gprs_subscr_get(gsub, __FILE__, __LINE__) +#define gprs_subscr_put(gsub) _gprs_subscr_put(gsub, __FILE__, __LINE__) -- To view, visit https://gerrit.osmocom.org/10540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icdf7af7a31fbba9197b3711eaf102fc0ae333bcc Gerrit-Change-Number: 10540 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 13:52:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 13:52:26 +0000 Subject: Change in libosmocore[master]: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10541 Change subject: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release ...................................................................... vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release Setting age to 5 is cleary an error, it should be increment by one instead as APIs were added 0.11->0.12 and none modified or removed. Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 --- M src/vty/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/10541/1 diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 5d0ded7..49813c5 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=5:0:5 +LIBVERSION=5:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/10541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 Gerrit-Change-Number: 10541 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:02:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:02:23 +0000 Subject: Change in libosmocore[pespin/0.12.0]: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10542 Change subject: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release ...................................................................... vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release Setting age to 5 is cleary an error, it should be increment by one instead as APIs were added 0.11->0.12 and none modified or removed. Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 --- M src/vty/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/10542/1 diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 5d0ded7..49813c5 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=5:0:5 +LIBVERSION=5:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/10542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: pespin/0.12.0 Gerrit-MessageType: newchange Gerrit-Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 Gerrit-Change-Number: 10542 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:02:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:02:23 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bpespin/0=2E12=2E0=5D=3A_Bump_version=3A_0=2E12=2E0=2E1-37945-dirty_=E2=86=92_0=2E12=2E1?= Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10543 Change subject: Bump version: 0.12.0.1-37945-dirty ? 0.12.1 ...................................................................... Bump version: 0.12.0.1-37945-dirty ? 0.12.1 Change-Id: I56eb7bdebb17231feee9ef5dbe5010428bf09ed4 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/10543/1 diff --git a/debian/changelog b/debian/changelog index 606d923..e8512ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmocore (0.12.1) unstable; urgency=medium + + * vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release + + -- Pau Espin Pedrol Mon, 20 Aug 2018 15:59:47 +0200 + libosmocore (0.12.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/10543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: pespin/0.12.0 Gerrit-MessageType: newchange Gerrit-Change-Id: I56eb7bdebb17231feee9ef5dbe5010428bf09ed4 Gerrit-Change-Number: 10543 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:10:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:10:09 +0000 Subject: Change in libosmocore[pespin/0.12.0]: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10542 ) Change subject: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: pespin/0.12.0 Gerrit-MessageType: comment Gerrit-Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 Gerrit-Change-Number: 10542 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 20 Aug 2018 14:10:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:10:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:10:11 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bpespin/0=2E12=2E0=5D=3A_Bump_version=3A_0=2E12=2E0=2E1-37945-dirty_=E2=86=92_0=2E12=2E1?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10543 ) Change subject: Bump version: 0.12.0.1-37945-dirty ? 0.12.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: pespin/0.12.0 Gerrit-MessageType: comment Gerrit-Change-Id: I56eb7bdebb17231feee9ef5dbe5010428bf09ed4 Gerrit-Change-Number: 10543 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 20 Aug 2018 14:10:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:10:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:10:26 +0000 Subject: Change in libosmocore[pespin/0.12.0]: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10542 ) Change subject: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release ...................................................................... vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release Setting age to 5 is cleary an error, it should be increment by one instead as APIs were added 0.11->0.12 and none modified or removed. Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 --- M src/vty/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 5d0ded7..49813c5 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=5:0:5 +LIBVERSION=5:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/10542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: pespin/0.12.0 Gerrit-MessageType: merged Gerrit-Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 Gerrit-Change-Number: 10542 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:10:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:10:27 +0000 Subject: =?UTF-8?Q?Change_in_libosmocore=5Bpespin/0=2E12=2E0=5D=3A_Bump_version=3A_0=2E12=2E0=2E1-37945-dirty_=E2=86=92_0=2E12=2E1?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10543 ) Change subject: Bump version: 0.12.0.1-37945-dirty ? 0.12.1 ...................................................................... Bump version: 0.12.0.1-37945-dirty ? 0.12.1 Change-Id: I56eb7bdebb17231feee9ef5dbe5010428bf09ed4 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 606d923..e8512ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmocore (0.12.1) unstable; urgency=medium + + * vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release + + -- Pau Espin Pedrol Mon, 20 Aug 2018 15:59:47 +0200 + libosmocore (0.12.0) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/10543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: pespin/0.12.0 Gerrit-MessageType: merged Gerrit-Change-Id: I56eb7bdebb17231feee9ef5dbe5010428bf09ed4 Gerrit-Change-Number: 10543 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:14:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:14:47 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to 0.12.1 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10544 Change subject: libosmocore: Update to 0.12.1 ...................................................................... libosmocore: Update to 0.12.1 Change-Id: I94c56ea74ca2726c56caf2b95f55b0998ff753dc --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/44/10544/1 diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 9aedec1..09ac239 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "924ef0bc72c1be165e8d5c22859f8b4eddbc0f06" +SRCREV = "f36e0abb9796530a80937057eed2985f652d37f2" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "0.12.0+gitr${SRCPV}" +PV = "0.12.1+gitr${SRCPV}" PR = "r0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" -- To view, visit https://gerrit.osmocom.org/10544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I94c56ea74ca2726c56caf2b95f55b0998ff753dc Gerrit-Change-Number: 10544 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:26:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 14:26:28 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to 0.12.1 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10544 ) Change subject: libosmocore: Update to 0.12.1 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I94c56ea74ca2726c56caf2b95f55b0998ff753dc Gerrit-Change-Number: 10544 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 20 Aug 2018 14:26:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:33:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 14:33:30 +0000 Subject: Change in libosmocore[master]: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10541 ) Change subject: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 Gerrit-Change-Number: 10541 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 20 Aug 2018 14:33:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 14:36:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 14:36:26 +0000 Subject: Change in libosmocore[master]: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10541 ) Change subject: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release ...................................................................... Patch Set 1: fix src/Makefile.am from 11:0:0 to 11:0:1 here as well? -- To view, visit https://gerrit.osmocom.org/10541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 Gerrit-Change-Number: 10541 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 20 Aug 2018 14:36:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:06:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 15:06:04 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: add calypso SIM data (commented) In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/10132 ) Change subject: resources.conf.prod: add calypso SIM data (commented) ...................................................................... Abandoned abandoning since I have no idea what is going on -- To view, visit https://gerrit.osmocom.org/10132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Iafe42f743a2a09a81d421764aae578e4a280eae0 Gerrit-Change-Number: 10132 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 15:07:03 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: properly handle RSL Release Ind from MS In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/7221 ) Change subject: abis_rsl: properly handle RSL Release Ind from MS ...................................................................... Abandoned nonsense -- To view, visit https://gerrit.osmocom.org/7221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I0f8c9c4e6b6850b15c70250fd3f88bdf75f9accf Gerrit-Change-Number: 7221 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Aug 20 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 20 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#221?= In-Reply-To: <31585435.14.1534691407035.JavaMail.jenkins@jenkins.osmocom.org> References: <31585435.14.1534691407035.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1201926074.43.1534777806889.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.81 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:12:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 15:12:30 +0000 Subject: Change in libosmo-sccp[master]: ipa: if there are PCs in the msg, use them for routing In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10163 ) Change subject: ipa: if there are PCs in the msg, use them for routing ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I157c43a5dc12f6e24828efef1dceac246497e313 Gerrit-Change-Number: 10163 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 20 Aug 2018 15:12:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:13:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 15:13:14 +0000 Subject: Change in libosmo-sccp[master]: ipa: if there are PCs in the msg, use them for routing In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10163 ) Change subject: ipa: if there are PCs in the msg, use them for routing ...................................................................... Patch Set 1: (adding Harald as reviewer to ask for feedback on above comment) -- To view, visit https://gerrit.osmocom.org/10163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I157c43a5dc12f6e24828efef1dceac246497e313 Gerrit-Change-Number: 10163 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 20 Aug 2018 15:13:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:15:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 15:15:51 +0000 Subject: Change in libosmo-sccp[master]: ipa: if there are PCs in the msg, use them for routing In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10163 ) Change subject: ipa: if there are PCs in the msg, use them for routing ...................................................................... Patch Set 1: to clarify why I think the current code needs fixing: the function patch_sccp_with_pc() writes point-codes into the message only if there aren't any yet. I think we should rather always overwrite, or fail on mismatch. right? -- To view, visit https://gerrit.osmocom.org/10163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I157c43a5dc12f6e24828efef1dceac246497e313 Gerrit-Change-Number: 10163 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 20 Aug 2018 15:15:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:18:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 15:18:35 +0000 Subject: Change in libosmo-sccp[master]: ipa_asp_fsm: init: expect IPA ID ACK, not GET In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10162 ) Change subject: ipa_asp_fsm: init: expect IPA ID ACK, not GET ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icffda98579e676ab6ca63c9c22cf5d151c4fe95f Gerrit-Change-Number: 10162 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 15:18:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:32:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 15:32:47 +0000 Subject: Change in osmo-iuh[master]: fix decoding of incoming X.213 NSAP addr Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10545 Change subject: fix decoding of incoming X.213 NSAP addr ...................................................................... fix decoding of incoming X.213 NSAP addr Fix ranap_transp_layer_addr_decode() to test == 7 instead of > 7: If a femto cell sends its Transport Layer Address as X.213 NSAP IPv4, we receive 3 header bytes and four IP-address bytes, so the length is exactly 7. This function is very vague on numerous other decoding details, but this patch only fixes the vital length check that makes 3G usable with X.213 NSAP. Related: OS#3420 Change-Id: I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 --- M src/iu_helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/45/10545/1 diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 5e78293..39b0521 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -109,7 +109,7 @@ buf = trasp_layer_addr->buf; len = trasp_layer_addr->size; - if (buf[0] == 0x35 && len > 7) + if (buf[0] == 0x35 && len == 7) rc = inet_ntop(AF_INET, buf + 3, addr, addr_len); else if (len > 3) rc = inet_ntop(AF_INET, buf, addr, addr_len); -- To view, visit https://gerrit.osmocom.org/10545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 Gerrit-Change-Number: 10545 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:54 +0000 Subject: Change in openbsc[master]: cosmetic: make osmo-python-tests dependency more accurate Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10546 Change subject: cosmetic: make osmo-python-tests dependency more accurate ...................................................................... cosmetic: make osmo-python-tests dependency more accurate Backport from osmo-mgw.git. Change-Id: I4f84a13b7fa6ec4173bdc155e6114d4d7328b619 --- M openbsc/configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/46/10546/1 diff --git a/openbsc/configure.ac b/openbsc/configure.ac index f1f6038..ae9e69e 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -206,7 +206,7 @@ AM_PATH_PYTHON AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then - AC_MSG_ERROR([Please install osmocom-python to run the VTY/CTRL tests.]) + AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) fi fi AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) -- To view, visit https://gerrit.osmocom.org/10546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4f84a13b7fa6ec4173bdc155e6114d4d7328b619 Gerrit-Change-Number: 10546 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:55 +0000 Subject: Change in openbsc[master]: examples: osmo-bsc_mgcp: Update cfg file Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10547 Change subject: examples: osmo-bsc_mgcp: Update cfg file ...................................................................... examples: osmo-bsc_mgcp: Update cfg file Backport partially (related parts) of osmo-mgw.git a1756f320acb7021c501d56252db133012ad479f ["Implement IuCS (large refactoring and addition)"] Change-Id: I375e67874ccfaadd92d203a911444294d40dfc22 --- M openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/47/10547/1 diff --git a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg index 791497f..67f288e 100644 --- a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg +++ b/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg @@ -7,13 +7,13 @@ no login ! mgcp -! local ip 213.167.134.14 - bts ip 172.16.252.43 - bind ip 127.0.0.1 + !local ip 213.167.134.14 + !bts ip 172.16.252.43 + !bind ip 127.0.0.1 bind port 2427 rtp base 4000 rtp force-ptime 20 sdp audio payload number 98 sdp audio payload name AMR/8000 number endpoints 31 - loop 1 + no rtcp-omit -- To view, visit https://gerrit.osmocom.org/10547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I375e67874ccfaadd92d203a911444294d40dfc22 Gerrit-Change-Number: 10547 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:56 +0000 Subject: Change in openbsc[master]: mgcp: add VTY Option to force-realloc endpoints Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10548 Change subject: mgcp: add VTY Option to force-realloc endpoints ...................................................................... mgcp: add VTY Option to force-realloc endpoints Currently the force_realloc feature is turnd on and of in a hardcoded way. This patch makes the option available via VTY. Backport from osmo-mgw.git. Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f --- M openbsc/src/libmgcp/mgcp_vty.c M openbsc/src/osmo-bsc_mgcp/mgcp_main.c M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c M openbsc/src/osmo-bsc_nat/bsc_nat.c 4 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/48/10548/1 diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index d5908f3..23207df 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -604,6 +604,16 @@ return CMD_SUCCESS; } +DEFUN(cfg_mgcp_force_realloc, + cfg_mgcp_force_realloc_cmd, + "force-realloc (0|1)", + "Force endpoint reallocation when the endpoint is still seized\n" + "Don't force reallocation\n" "force reallocation\n") +{ + g_cfg->trunk.force_realloc = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_mgcp_number_endp, cfg_mgcp_number_endp_cmd, "number endpoints <0-65534>", @@ -816,9 +826,10 @@ trunk->keepalive_interval, VTY_NEWLINE); else vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE); - vty_out(vty, " loop %d%s", trunk->audio_loop, VTY_NEWLINE); + vty_out(vty, " force-realloc %d%s", + trunk->force_realloc, VTY_NEWLINE); if (trunk->omit_rtcp) vty_out(vty, " rtcp-omit%s", VTY_NEWLINE); else @@ -1448,6 +1459,7 @@ install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd_old); install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd_old); install_element(MGCP_NODE, &cfg_mgcp_loop_cmd); + install_element(MGCP_NODE, &cfg_mgcp_force_realloc_cmd); install_element(MGCP_NODE, &cfg_mgcp_number_endp_cmd); install_element(MGCP_NODE, &cfg_mgcp_omit_rtcp_cmd); install_element(MGCP_NODE, &cfg_mgcp_no_omit_rtcp_cmd); diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 4ea0700..6cf9ab7 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -218,6 +218,8 @@ cfg->get_net_downlink_format_cb = &mgcp_transcoding_net_downlink_format; #endif + cfg->trunk.force_realloc = 1; + vty_info.copyright = openbsc_copyright; vty_init(&vty_info); logging_vty_add_cmds(NULL); diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 8cf4e94..986306c 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -1111,7 +1111,6 @@ /* some more MGCP config handling */ cfg->data = nat; cfg->policy_cb = bsc_mgcp_policy_cb; - cfg->trunk.force_realloc = 1; if (cfg->bts_ip) talloc_free(cfg->bts_ip); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 0559758..45f53bc 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1652,6 +1652,9 @@ rate_ctr_init(tall_bsc_ctx); osmo_stats_init(tall_bsc_ctx); + /* Ensure that forced enpoint allocation is turned on by default */ + nat->mgcp_cfg->trunk.force_realloc = 1; + /* init vty and parse */ if (mgcp_parse_config(config_file, nat->mgcp_cfg, MGCP_BSC_NAT) < 0) { fprintf(stderr, "Failed to parse the config file: '%s'\n", config_file); -- To view, visit https://gerrit.osmocom.org/10548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f Gerrit-Change-Number: 10548 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:57 +0000 Subject: Change in openbsc[master]: mgcp_test: tweak test failure output Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10549 Change subject: mgcp_test: tweak test failure output ...................................................................... mgcp_test: tweak test failure output Backport from osmo-mgw.git 020e89bce914d394352dddb8186b65a319562b20. Change-Id: Ibfc80f06b2811cc32fe38518b11efd6764b347ee --- M openbsc/tests/mgcp/mgcp_test.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/49/10549/1 diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 570a0c9..154d0f3 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -543,7 +543,8 @@ if (msg) printf("%s failed '%s'\n", t->name, (char *) msg->data); } else if (strcmp((char *) msg->data, t->exp_resp) != 0) - printf("%s failed '%s'\n", t->name, (char *) msg->data); + printf("%s failed.\nExpected:\n%s\nGot:\n%s\n", + t->name, t->exp_resp, (char *) msg->data); msgb_free(msg); if (dummy_packets) @@ -653,7 +654,8 @@ msg = mgcp_handle_message(cfg, inp); msgb_free(inp); if (strcmp((char *) msg->data, t->exp_resp) != 0) - printf("%s failed '%s'\n", t->name, (char *) msg->data); + printf("%s failed.\nExpected:\n%s\nGot:\n%s\n", + t->name, t->exp_resp, (char *) msg->data); msgb_free(msg); /* Retransmit... */ @@ -662,7 +664,8 @@ msg = mgcp_handle_message(cfg, inp); msgb_free(inp); if (strcmp((char *) msg->data, t->exp_resp) != 0) - printf("%s failed '%s'\n", t->name, (char *) msg->data); + printf("%s failed.\nExpected:\n%s\nGot:\n%s\n", + t->name, t->exp_resp, (char *) msg->data); msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/10549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfc80f06b2811cc32fe38518b11efd6764b347ee Gerrit-Change-Number: 10549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:58 +0000 Subject: Change in openbsc[master]: osmo-bsc-mgcp: Add debian package Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10550 Change subject: osmo-bsc-mgcp: Add debian package ...................................................................... osmo-bsc-mgcp: Add debian package Change-Id: I2b0953eb6ea2d92c95406f66ba59e1c2db6be814 --- M debian/control A debian/osmo-bsc-mgcp.install 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/50/10550/1 diff --git a/debian/control b/debian/control index 76b7d2a..46a8ab5 100644 --- a/debian/control +++ b/debian/control @@ -71,6 +71,12 @@ . This package is part of OpenBSC and closely related to osmocom-bsc-sccplite. +Package: osmo-bsc-mgcp +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: OsmoBSC-MGCP: Osmocom's Legacy Media Gateway. + Package: openbsc-dev Architecture: all Depends: ${misc:Depends} @@ -121,3 +127,10 @@ Depends: osmocom-bsc-nat (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for the OpenBSC Network Address Translation Make debugging possible + +Package: osmo-bsc-mgcp-dbg +Architecture: any +Section: debug +Priority: extra +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Debug symbols for the Osmocom's Legacy Media Gateway. diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install new file mode 100644 index 0000000..1550437 --- /dev/null +++ b/debian/osmo-bsc-mgcp.install @@ -0,0 +1 @@ +usr/bin/osmo-bsc_mgcp -- To view, visit https://gerrit.osmocom.org/10550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2b0953eb6ea2d92c95406f66ba59e1c2db6be814 Gerrit-Change-Number: 10550 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:58 +0000 Subject: Change in openbsc[master]: Debian: Include the osmo-bsc-mgcp systemd service in Debian package Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10551 Change subject: Debian: Include the osmo-bsc-mgcp systemd service in Debian package ...................................................................... Debian: Include the osmo-bsc-mgcp systemd service in Debian package Backport from osmo-mgw.git. Change-Id: Ife3f034ddaaba993bf27c1f9a34a1d57d1bf3e05 --- A openbsc/debian/osmo-bsc-mgcp.service 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/51/10551/1 diff --git a/openbsc/debian/osmo-bsc-mgcp.service b/openbsc/debian/osmo-bsc-mgcp.service new file mode 120000 index 0000000..eb73b7b --- /dev/null +++ b/openbsc/debian/osmo-bsc-mgcp.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ife3f034ddaaba993bf27c1f9a34a1d57d1bf3e05 Gerrit-Change-Number: 10551 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:59 +0000 Subject: Change in openbsc[master]: legacy_mgcp: mgcp_test: sanitize: free msgb_ctx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10552 Change subject: legacy_mgcp: mgcp_test: sanitize: free msgb_ctx ...................................................................... legacy_mgcp: mgcp_test: sanitize: free msgb_ctx Ensure that all msgb were cleaned up, then free the overall msgb_ctx, in order to not leave any memory leaks the sanitizer build complains about. Backport from osmo-mgw.git Change-Id: I84e0ac7f0928f04ffddd7da18200466841589c25 --- M openbsc/tests/mgcp/mgcp_test.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/52/10552/1 diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 154d0f3..92099db 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -1208,7 +1208,7 @@ int main(int argc, char **argv) { - msgb_talloc_ctx_init(NULL, 0); + void *msgb_ctx = msgb_talloc_ctx_init(NULL, 0); osmo_init_logging(&log_info); test_strline(); @@ -1227,6 +1227,9 @@ test_no_name(); test_osmux_cid(); + OSMO_ASSERT(talloc_total_size(msgb_ctx) == 0); + OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1); + talloc_free(msgb_ctx); printf("Done\n"); return EXIT_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I84e0ac7f0928f04ffddd7da18200466841589c25 Gerrit-Change-Number: 10552 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 15:55:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 15:55:59 +0000 Subject: Change in openbsc[master]: configure: Find correct libgsm's gsm.h header Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10553 Change subject: configure: Find correct libgsm's gsm.h header ...................................................................... configure: Find correct libgsm's gsm.h header Some distributions (archlinux) or versions of libgsm install gsm.h in /usr/include/gsm/gsm.h Since libgsm doesn't come with a pkfconfig, let's first check if gsm.h and take the correct path in the build setup. Backport from osmo-mgw.git Change-Id: I07d3c03903e0d4bb80e843c7ed917a27b791ea53 --- M openbsc/configure.ac M openbsc/include/openbsc/mgcp_transcode.h 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/53/10553/1 diff --git a/openbsc/configure.ac b/openbsc/configure.ac index ae9e69e..c3615d6 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -81,6 +81,13 @@ AC_ARG_WITH([g729], [AS_HELP_STRING([--with-g729], [Enable G.729 encoding/decoding.])], [osmo_ac_with_g729="$withval"],[osmo_ac_with_g729="no"]) if test "$osmo_ac_mgcp_transcoding" = "yes" ; then + AC_CHECK_HEADERS([gsm.h gsm/gsm.h], [osmo_ac_found_gsm_headers=yes]) + if test "$osmo_ac_found_gsm_headers" != "yes" ; then + AC_MSG_ERROR([Unable to find the libgsm headers]) + fi + AC_SUBST(HAVE_GSM_H) + AC_SUBST(HAVE_GSM_GSM_H) + AC_SEARCH_LIBS([gsm_create], [gsm], [LIBRARY_GSM="$LIBS";LIBS=""], [AC_MSG_ERROR([--enable-mgcp-transcoding: cannot find usable libgsm])]) AC_SUBST(LIBRARY_GSM) if test "$osmo_ac_with_g729" = "yes" ; then diff --git a/openbsc/include/openbsc/mgcp_transcode.h b/openbsc/include/openbsc/mgcp_transcode.h index 147e48b..6892deb 100644 --- a/openbsc/include/openbsc/mgcp_transcode.h +++ b/openbsc/include/openbsc/mgcp_transcode.h @@ -21,7 +21,11 @@ #include "bscconfig.h" +#if HAVE_GSM_H #include +#elif HAVE_GSM_GSM_H +#include +#endif #ifdef HAVE_BCG729 #include #include -- To view, visit https://gerrit.osmocom.org/10553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I07d3c03903e0d4bb80e843c7ed917a27b791ea53 Gerrit-Change-Number: 10553 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 16:00:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 16:00:06 +0000 Subject: Change in openbsc[master]: cosmetic: make osmo-python-tests dependency more accurate In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10546 ) Change subject: cosmetic: make osmo-python-tests dependency more accurate ...................................................................... Patch Set 1: In this patch series I made my best to back-port interesting changes made in osmo-mgw.git for libosmo-mgcp-legacy which were not done in openbsc.git. This backporting is done because it was decided that we want to drop openbsc-related code (libosmo-mgcp-legacy) from osmo-mgw and instead keep it in openbsc.git. Backporting was quit difficult since there were several code bombs in osmo-mgw.git modifying lots of stuff. One of them is about converting old mgcp stuff into a library, which implies moving lots of stuff in different files, and that's done already after first code bomb to introduce it in osmo-mgw.git. As the only user of libosmo-lgeacy-mgcp are inside openbsc.git, we don't care about having a library there, so we keep it as it is (a static library). As a result, related patches modifying dependencies of osmo-mgcp-bsc and libosmo-legacy-mgcp are also not backported since they only make sense after moving from static to shared library. -- To view, visit https://gerrit.osmocom.org/10546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f84a13b7fa6ec4173bdc155e6114d4d7328b619 Gerrit-Change-Number: 10546 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 16:00:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 16:28:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Aug 2018 16:28:17 +0000 Subject: Change in osmo-bts[master]: measurement: make sure measurement interval end is detected In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10492 to look at the new patch set (#2). Change subject: measurement: make sure measurement interval end is detected ...................................................................... measurement: make sure measurement interval end is detected the measurement interval end is detected by using the measurement indication that is related to the SACCH block as a trigger to start the computation. If the measurement indication for the SACCH gets lost because the block could not be received then the processing is not executed. This may cause wrong results or when it happens condecutively an overflow of the measurement sample buffer. - Store the frame number of the last received measurement indication - Use the stored frame number to check if an interval was crossed when the next measurement indication is received. If we detect that we missed the interval, catch up by running the computation and start the next interval. Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Related: OS#2975 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 5 files changed, 1,071 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/10492/2 -- To view, visit https://gerrit.osmocom.org/10492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Gerrit-Change-Number: 10492 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 16:28:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 20 Aug 2018 16:28:18 +0000 Subject: Change in osmo-bts[master]: measurement: make sure state is reset on chan act. Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10554 Change subject: measurement: make sure state is reset on chan act. ...................................................................... measurement: make sure state is reset on chan act. At the moment only lchan_meas_reset is reset on channel activation. All other states are not reset. This may lead to irretations in the first measurement interval if there are still leftover messages from a previous connection. Lets ensure everything is reset to zero by zeroing out the whole .meas struct in struct lchan. - Add a centralized function that does the reset - Call that function from rsl_tx_chan_act_ack() in rsl.c Change-Id: I880ae3030df6dcd60c32b7144c3430528429bdea Related: OS#2975 Related: OS#2987 --- M include/osmo-bts/measurement.h M src/common/measurement.c M src/common/rsl.c 3 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/54/10554/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 283b0ff..d98e9f0 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -10,4 +10,6 @@ void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); +void lchan_meas_reset(struct gsm_lchan *lchan); + #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index a75b54d..bd2c0b7 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -490,3 +490,11 @@ * measurment report at Meas period End */ lchan_meas_check_compute(lchan, fn); } + +/* Reset all measurement related struct members to their initial values. This + * function will be called every time an lchan is activated to ensure the + * measurement process starts with a defined state. */ +void lchan_meas_reset(struct gsm_lchan *lchan) +{ + memset(&lchan->meas, 0, sizeof(lchan->meas)); +} diff --git a/src/common/rsl.c b/src/common/rsl.c index a24c444..ff2d997 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -750,7 +750,7 @@ msg->trx = lchan->ts->trx; /* since activation was successful, do some lchan initialization */ - lchan->meas.res_nr = 0; + lchan_meas_reset(lchan); return abis_bts_rsl_sendmsg(msg); } -- To view, visit https://gerrit.osmocom.org/10554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I880ae3030df6dcd60c32b7144c3430528429bdea Gerrit-Change-Number: 10554 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 20 17:51:01 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 20 Aug 2018 17:51:01 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcap in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7aff8768e02_6357dac67c18482a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcap/Debian_9.0/armv7l Package network:osmocom:latest/osmo-pcap failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-pcap Last lines of build log: 500 rename /var/cache/obs/worker/cache/content.new /var/cache/obs/worker/cache/content: No such file or directory (worker was obs-arm-6:9) gave up after 17 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 20 17:58:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 20 Aug 2018 17:58:07 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Replace '.' in counter names with ':' Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10555 Change subject: gbproxy: Replace '.' in counter names with ':' ...................................................................... gbproxy: Replace '.' in counter names with ':' The '.' is illegal character in counter names, as they are exported via CTRL interface, where '.' has a special meaning that cannot be used by strings comprising the variable name. Change-Id: I66a7e044c027672adf77fbd6c0a111c43ee31b4f --- M src/gprs/gb_proxy_peer.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/55/10555/1 diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c index 8e28fc4..a862a83 100644 --- a/src/gprs/gb_proxy_peer.c +++ b/src/gprs/gb_proxy_peer.c @@ -40,13 +40,13 @@ { "dropped", "BVC blocked, dropped packet " }, { "inv-nsei", "NSEI mismatch " }, { "tx-err", "NS Transmission error " }, - { "raid-mod.bss", "RAID patched (BSS )" }, - { "raid-mod.sgsn", "RAID patched (SGSN)" }, - { "apn-mod.sgsn", "APN patched " }, - { "tlli-mod.bss", "TLLI patched (BSS )" }, - { "tlli-mod.sgsn", "TLLI patched (SGSN)" }, - { "ptmsi-mod.bss", "P-TMSI patched (BSS )" }, - { "ptmsi-mod.sgsn","P-TMSI patched (SGSN)" }, + { "raid-mod:bss", "RAID patched (BSS )" }, + { "raid-mod:sgsn", "RAID patched (SGSN)" }, + { "apn-mod:sgsn", "APN patched " }, + { "tlli-mod:bss", "TLLI patched (BSS )" }, + { "tlli-mod:sgsn", "TLLI patched (SGSN)" }, + { "ptmsi-mod:bss", "P-TMSI patched (BSS )" }, + { "ptmsi-mod:sgsn","P-TMSI patched (SGSN)" }, { "mod-crypt-err", "Patch error: encrypted " }, { "mod-err", "Patch error: other " }, { "attach-reqs", "Attach Request count " }, -- To view, visit https://gerrit.osmocom.org/10555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66a7e044c027672adf77fbd6c0a111c43ee31b4f Gerrit-Change-Number: 10555 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 18:09:16 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 20 Aug 2018 18:09:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10392 to look at the new patch set (#4). Change subject: sgsn: add TC_attach_gmm_attach_req_while_gmm_attach ...................................................................... sgsn: add TC_attach_gmm_attach_req_while_gmm_attach Testing the corner case of receiving an Attach Request while not (yet) sent an Attach Accept. MS -> SGSN: Attach Request IMSI MS <- SGSN: Identity Request IMSI (optional) MS -> SGSN: Identity Response IMSI (optional) MS <- SGSN: Identity Request IMEI MS -> SGSN: Attach Request (2nd) MS <- SGSN: Identity Response IMEI MS <- SGSN: Attach Accept MS -> SGSN: Attach Complete Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/10392/4 -- To view, visit https://gerrit.osmocom.org/10392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0bac50dc5a72ba8f9010b05bcb98aa7ff0b81cf6 Gerrit-Change-Number: 10392 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 19:55:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 19:55:27 +0000 Subject: Change in pysim[master]: readme: add 'serial' dep, cosmetically rearrange In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10051 ) Change subject: readme: add 'serial' dep, cosmetically rearrange ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/10051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I414b897ba4911b7428ddf807cb04a93700ee0193 Gerrit-Change-Number: 10051 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 19:55:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 19:55:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 19:55:29 +0000 Subject: Change in pysim[master]: readme: add 'serial' dep, cosmetically rearrange In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10051 ) Change subject: readme: add 'serial' dep, cosmetically rearrange ...................................................................... readme: add 'serial' dep, cosmetically rearrange Change-Id: I414b897ba4911b7428ddf807cb04a93700ee0193 --- M README.md 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Neels Hofmeyr: Verified Harald Welte: Looks good to me, approved diff --git a/README.md b/README.md index e098700..85b9a57 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,17 @@ Dependencies ------------ -pysim requires pyscard and pytlv. Both can be installed using python-pip: -pip install pytlv -pip install pyscard +pysim requires: + +- pyscard +- serial +- pytlv (for specific card types) + +Example for Debian: + + apt-get install python-pyscard python-serial python-pip + pip install pytlv Mailing List -- To view, visit https://gerrit.osmocom.org/10051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I414b897ba4911b7428ddf807cb04a93700ee0193 Gerrit-Change-Number: 10051 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:20:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:20:31 +0000 Subject: Change in openbsc[master]: cosmetic: make osmo-python-tests dependency more accurate In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10546 ) Change subject: cosmetic: make osmo-python-tests dependency more accurate ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f84a13b7fa6ec4173bdc155e6114d4d7328b619 Gerrit-Change-Number: 10546 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 20 Aug 2018 20:20:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:20:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:20:35 +0000 Subject: Change in openbsc[master]: examples: osmo-bsc_mgcp: Update cfg file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10547 ) Change subject: examples: osmo-bsc_mgcp: Update cfg file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I375e67874ccfaadd92d203a911444294d40dfc22 Gerrit-Change-Number: 10547 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:20:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:20:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:20:37 +0000 Subject: Change in openbsc[master]: mgcp: add VTY Option to force-realloc endpoints In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10548 ) Change subject: mgcp: add VTY Option to force-realloc endpoints ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f Gerrit-Change-Number: 10548 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:20:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:20:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:20:39 +0000 Subject: Change in openbsc[master]: mgcp_test: tweak test failure output In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10549 ) Change subject: mgcp_test: tweak test failure output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibfc80f06b2811cc32fe38518b11efd6764b347ee Gerrit-Change-Number: 10549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:20:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:20:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:20:43 +0000 Subject: Change in openbsc[master]: Debian: Include the osmo-bsc-mgcp systemd service in Debian package In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10551 ) Change subject: Debian: Include the osmo-bsc-mgcp systemd service in Debian package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife3f034ddaaba993bf27c1f9a34a1d57d1bf3e05 Gerrit-Change-Number: 10551 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:20:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:20:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:20:45 +0000 Subject: Change in openbsc[master]: legacy_mgcp: mgcp_test: sanitize: free msgb_ctx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10552 ) Change subject: legacy_mgcp: mgcp_test: sanitize: free msgb_ctx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I84e0ac7f0928f04ffddd7da18200466841589c25 Gerrit-Change-Number: 10552 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:20:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:01 +0000 Subject: Change in openbsc[master]: configure: Find correct libgsm's gsm.h header In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10553 ) Change subject: configure: Find correct libgsm's gsm.h header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07d3c03903e0d4bb80e843c7ed917a27b791ea53 Gerrit-Change-Number: 10553 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:21:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:07 +0000 Subject: Change in openbsc[master]: osmo-bsc-mgcp: Add debian package In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10550 ) Change subject: osmo-bsc-mgcp: Add debian package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2b0953eb6ea2d92c95406f66ba59e1c2db6be814 Gerrit-Change-Number: 10550 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:21:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:10 +0000 Subject: Change in openbsc[master]: cosmetic: make osmo-python-tests dependency more accurate In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10546 ) Change subject: cosmetic: make osmo-python-tests dependency more accurate ...................................................................... cosmetic: make osmo-python-tests dependency more accurate Backport from osmo-mgw.git. Change-Id: I4f84a13b7fa6ec4173bdc155e6114d4d7328b619 --- M openbsc/configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/configure.ac b/openbsc/configure.ac index f1f6038..ae9e69e 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -206,7 +206,7 @@ AM_PATH_PYTHON AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then - AC_MSG_ERROR([Please install osmocom-python to run the VTY/CTRL tests.]) + AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) fi fi AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) -- To view, visit https://gerrit.osmocom.org/10546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4f84a13b7fa6ec4173bdc155e6114d4d7328b619 Gerrit-Change-Number: 10546 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:11 +0000 Subject: Change in openbsc[master]: examples: osmo-bsc_mgcp: Update cfg file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10547 ) Change subject: examples: osmo-bsc_mgcp: Update cfg file ...................................................................... examples: osmo-bsc_mgcp: Update cfg file Backport partially (related parts) of osmo-mgw.git a1756f320acb7021c501d56252db133012ad479f ["Implement IuCS (large refactoring and addition)"] Change-Id: I375e67874ccfaadd92d203a911444294d40dfc22 --- M openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg index 791497f..67f288e 100644 --- a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg +++ b/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg @@ -7,13 +7,13 @@ no login ! mgcp -! local ip 213.167.134.14 - bts ip 172.16.252.43 - bind ip 127.0.0.1 + !local ip 213.167.134.14 + !bts ip 172.16.252.43 + !bind ip 127.0.0.1 bind port 2427 rtp base 4000 rtp force-ptime 20 sdp audio payload number 98 sdp audio payload name AMR/8000 number endpoints 31 - loop 1 + no rtcp-omit -- To view, visit https://gerrit.osmocom.org/10547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I375e67874ccfaadd92d203a911444294d40dfc22 Gerrit-Change-Number: 10547 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:11 +0000 Subject: Change in openbsc[master]: mgcp: add VTY Option to force-realloc endpoints In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10548 ) Change subject: mgcp: add VTY Option to force-realloc endpoints ...................................................................... mgcp: add VTY Option to force-realloc endpoints Currently the force_realloc feature is turnd on and of in a hardcoded way. This patch makes the option available via VTY. Backport from osmo-mgw.git. Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f --- M openbsc/src/libmgcp/mgcp_vty.c M openbsc/src/osmo-bsc_mgcp/mgcp_main.c M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c M openbsc/src/osmo-bsc_nat/bsc_nat.c 4 files changed, 18 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index d5908f3..23207df 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -604,6 +604,16 @@ return CMD_SUCCESS; } +DEFUN(cfg_mgcp_force_realloc, + cfg_mgcp_force_realloc_cmd, + "force-realloc (0|1)", + "Force endpoint reallocation when the endpoint is still seized\n" + "Don't force reallocation\n" "force reallocation\n") +{ + g_cfg->trunk.force_realloc = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_mgcp_number_endp, cfg_mgcp_number_endp_cmd, "number endpoints <0-65534>", @@ -816,9 +826,10 @@ trunk->keepalive_interval, VTY_NEWLINE); else vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE); - vty_out(vty, " loop %d%s", trunk->audio_loop, VTY_NEWLINE); + vty_out(vty, " force-realloc %d%s", + trunk->force_realloc, VTY_NEWLINE); if (trunk->omit_rtcp) vty_out(vty, " rtcp-omit%s", VTY_NEWLINE); else @@ -1448,6 +1459,7 @@ install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd_old); install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd_old); install_element(MGCP_NODE, &cfg_mgcp_loop_cmd); + install_element(MGCP_NODE, &cfg_mgcp_force_realloc_cmd); install_element(MGCP_NODE, &cfg_mgcp_number_endp_cmd); install_element(MGCP_NODE, &cfg_mgcp_omit_rtcp_cmd); install_element(MGCP_NODE, &cfg_mgcp_no_omit_rtcp_cmd); diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 4ea0700..6cf9ab7 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -218,6 +218,8 @@ cfg->get_net_downlink_format_cb = &mgcp_transcoding_net_downlink_format; #endif + cfg->trunk.force_realloc = 1; + vty_info.copyright = openbsc_copyright; vty_init(&vty_info); logging_vty_add_cmds(NULL); diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 8cf4e94..986306c 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -1111,7 +1111,6 @@ /* some more MGCP config handling */ cfg->data = nat; cfg->policy_cb = bsc_mgcp_policy_cb; - cfg->trunk.force_realloc = 1; if (cfg->bts_ip) talloc_free(cfg->bts_ip); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 0559758..45f53bc 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1652,6 +1652,9 @@ rate_ctr_init(tall_bsc_ctx); osmo_stats_init(tall_bsc_ctx); + /* Ensure that forced enpoint allocation is turned on by default */ + nat->mgcp_cfg->trunk.force_realloc = 1; + /* init vty and parse */ if (mgcp_parse_config(config_file, nat->mgcp_cfg, MGCP_BSC_NAT) < 0) { fprintf(stderr, "Failed to parse the config file: '%s'\n", config_file); -- To view, visit https://gerrit.osmocom.org/10548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f Gerrit-Change-Number: 10548 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:11 +0000 Subject: Change in openbsc[master]: mgcp_test: tweak test failure output In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10549 ) Change subject: mgcp_test: tweak test failure output ...................................................................... mgcp_test: tweak test failure output Backport from osmo-mgw.git 020e89bce914d394352dddb8186b65a319562b20. Change-Id: Ibfc80f06b2811cc32fe38518b11efd6764b347ee --- M openbsc/tests/mgcp/mgcp_test.c 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 570a0c9..154d0f3 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -543,7 +543,8 @@ if (msg) printf("%s failed '%s'\n", t->name, (char *) msg->data); } else if (strcmp((char *) msg->data, t->exp_resp) != 0) - printf("%s failed '%s'\n", t->name, (char *) msg->data); + printf("%s failed.\nExpected:\n%s\nGot:\n%s\n", + t->name, t->exp_resp, (char *) msg->data); msgb_free(msg); if (dummy_packets) @@ -653,7 +654,8 @@ msg = mgcp_handle_message(cfg, inp); msgb_free(inp); if (strcmp((char *) msg->data, t->exp_resp) != 0) - printf("%s failed '%s'\n", t->name, (char *) msg->data); + printf("%s failed.\nExpected:\n%s\nGot:\n%s\n", + t->name, t->exp_resp, (char *) msg->data); msgb_free(msg); /* Retransmit... */ @@ -662,7 +664,8 @@ msg = mgcp_handle_message(cfg, inp); msgb_free(inp); if (strcmp((char *) msg->data, t->exp_resp) != 0) - printf("%s failed '%s'\n", t->name, (char *) msg->data); + printf("%s failed.\nExpected:\n%s\nGot:\n%s\n", + t->name, t->exp_resp, (char *) msg->data); msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/10549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibfc80f06b2811cc32fe38518b11efd6764b347ee Gerrit-Change-Number: 10549 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:12 +0000 Subject: Change in openbsc[master]: osmo-bsc-mgcp: Add debian package In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10550 ) Change subject: osmo-bsc-mgcp: Add debian package ...................................................................... osmo-bsc-mgcp: Add debian package Change-Id: I2b0953eb6ea2d92c95406f66ba59e1c2db6be814 --- M debian/control A debian/osmo-bsc-mgcp.install 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 76b7d2a..46a8ab5 100644 --- a/debian/control +++ b/debian/control @@ -71,6 +71,12 @@ . This package is part of OpenBSC and closely related to osmocom-bsc-sccplite. +Package: osmo-bsc-mgcp +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: OsmoBSC-MGCP: Osmocom's Legacy Media Gateway. + Package: openbsc-dev Architecture: all Depends: ${misc:Depends} @@ -121,3 +127,10 @@ Depends: osmocom-bsc-nat (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for the OpenBSC Network Address Translation Make debugging possible + +Package: osmo-bsc-mgcp-dbg +Architecture: any +Section: debug +Priority: extra +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Debug symbols for the Osmocom's Legacy Media Gateway. diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install new file mode 100644 index 0000000..1550437 --- /dev/null +++ b/debian/osmo-bsc-mgcp.install @@ -0,0 +1 @@ +usr/bin/osmo-bsc_mgcp -- To view, visit https://gerrit.osmocom.org/10550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2b0953eb6ea2d92c95406f66ba59e1c2db6be814 Gerrit-Change-Number: 10550 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:12 +0000 Subject: Change in openbsc[master]: Debian: Include the osmo-bsc-mgcp systemd service in Debian package In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10551 ) Change subject: Debian: Include the osmo-bsc-mgcp systemd service in Debian package ...................................................................... Debian: Include the osmo-bsc-mgcp systemd service in Debian package Backport from osmo-mgw.git. Change-Id: Ife3f034ddaaba993bf27c1f9a34a1d57d1bf3e05 --- A openbsc/debian/osmo-bsc-mgcp.service 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/debian/osmo-bsc-mgcp.service b/openbsc/debian/osmo-bsc-mgcp.service new file mode 120000 index 0000000..eb73b7b --- /dev/null +++ b/openbsc/debian/osmo-bsc-mgcp.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ife3f034ddaaba993bf27c1f9a34a1d57d1bf3e05 Gerrit-Change-Number: 10551 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:12 +0000 Subject: Change in openbsc[master]: legacy_mgcp: mgcp_test: sanitize: free msgb_ctx In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10552 ) Change subject: legacy_mgcp: mgcp_test: sanitize: free msgb_ctx ...................................................................... legacy_mgcp: mgcp_test: sanitize: free msgb_ctx Ensure that all msgb were cleaned up, then free the overall msgb_ctx, in order to not leave any memory leaks the sanitizer build complains about. Backport from osmo-mgw.git Change-Id: I84e0ac7f0928f04ffddd7da18200466841589c25 --- M openbsc/tests/mgcp/mgcp_test.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 154d0f3..92099db 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -1208,7 +1208,7 @@ int main(int argc, char **argv) { - msgb_talloc_ctx_init(NULL, 0); + void *msgb_ctx = msgb_talloc_ctx_init(NULL, 0); osmo_init_logging(&log_info); test_strline(); @@ -1227,6 +1227,9 @@ test_no_name(); test_osmux_cid(); + OSMO_ASSERT(talloc_total_size(msgb_ctx) == 0); + OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1); + talloc_free(msgb_ctx); printf("Done\n"); return EXIT_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I84e0ac7f0928f04ffddd7da18200466841589c25 Gerrit-Change-Number: 10552 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:13 +0000 Subject: Change in openbsc[master]: configure: Find correct libgsm's gsm.h header In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10553 ) Change subject: configure: Find correct libgsm's gsm.h header ...................................................................... configure: Find correct libgsm's gsm.h header Some distributions (archlinux) or versions of libgsm install gsm.h in /usr/include/gsm/gsm.h Since libgsm doesn't come with a pkfconfig, let's first check if gsm.h and take the correct path in the build setup. Backport from osmo-mgw.git Change-Id: I07d3c03903e0d4bb80e843c7ed917a27b791ea53 --- M openbsc/configure.ac M openbsc/include/openbsc/mgcp_transcode.h 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/configure.ac b/openbsc/configure.ac index ae9e69e..c3615d6 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -81,6 +81,13 @@ AC_ARG_WITH([g729], [AS_HELP_STRING([--with-g729], [Enable G.729 encoding/decoding.])], [osmo_ac_with_g729="$withval"],[osmo_ac_with_g729="no"]) if test "$osmo_ac_mgcp_transcoding" = "yes" ; then + AC_CHECK_HEADERS([gsm.h gsm/gsm.h], [osmo_ac_found_gsm_headers=yes]) + if test "$osmo_ac_found_gsm_headers" != "yes" ; then + AC_MSG_ERROR([Unable to find the libgsm headers]) + fi + AC_SUBST(HAVE_GSM_H) + AC_SUBST(HAVE_GSM_GSM_H) + AC_SEARCH_LIBS([gsm_create], [gsm], [LIBRARY_GSM="$LIBS";LIBS=""], [AC_MSG_ERROR([--enable-mgcp-transcoding: cannot find usable libgsm])]) AC_SUBST(LIBRARY_GSM) if test "$osmo_ac_with_g729" = "yes" ; then diff --git a/openbsc/include/openbsc/mgcp_transcode.h b/openbsc/include/openbsc/mgcp_transcode.h index 147e48b..6892deb 100644 --- a/openbsc/include/openbsc/mgcp_transcode.h +++ b/openbsc/include/openbsc/mgcp_transcode.h @@ -21,7 +21,11 @@ #include "bscconfig.h" +#if HAVE_GSM_H #include +#elif HAVE_GSM_GSM_H +#include +#endif #ifdef HAVE_BCG729 #include #include -- To view, visit https://gerrit.osmocom.org/10553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I07d3c03903e0d4bb80e843c7ed917a27b791ea53 Gerrit-Change-Number: 10553 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:21 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Replace '.' in counter names with ':' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10555 ) Change subject: gbproxy: Replace '.' in counter names with ':' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66a7e044c027672adf77fbd6c0a111c43ee31b4f Gerrit-Change-Number: 10555 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:21:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:22 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Replace '.' in counter names with ':' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10555 ) Change subject: gbproxy: Replace '.' in counter names with ':' ...................................................................... gbproxy: Replace '.' in counter names with ':' The '.' is illegal character in counter names, as they are exported via CTRL interface, where '.' has a special meaning that cannot be used by strings comprising the variable name. Change-Id: I66a7e044c027672adf77fbd6c0a111c43ee31b4f --- M src/gprs/gb_proxy_peer.c 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c index 8e28fc4..a862a83 100644 --- a/src/gprs/gb_proxy_peer.c +++ b/src/gprs/gb_proxy_peer.c @@ -40,13 +40,13 @@ { "dropped", "BVC blocked, dropped packet " }, { "inv-nsei", "NSEI mismatch " }, { "tx-err", "NS Transmission error " }, - { "raid-mod.bss", "RAID patched (BSS )" }, - { "raid-mod.sgsn", "RAID patched (SGSN)" }, - { "apn-mod.sgsn", "APN patched " }, - { "tlli-mod.bss", "TLLI patched (BSS )" }, - { "tlli-mod.sgsn", "TLLI patched (SGSN)" }, - { "ptmsi-mod.bss", "P-TMSI patched (BSS )" }, - { "ptmsi-mod.sgsn","P-TMSI patched (SGSN)" }, + { "raid-mod:bss", "RAID patched (BSS )" }, + { "raid-mod:sgsn", "RAID patched (SGSN)" }, + { "apn-mod:sgsn", "APN patched " }, + { "tlli-mod:bss", "TLLI patched (BSS )" }, + { "tlli-mod:sgsn", "TLLI patched (SGSN)" }, + { "ptmsi-mod:bss", "P-TMSI patched (BSS )" }, + { "ptmsi-mod:sgsn","P-TMSI patched (SGSN)" }, { "mod-crypt-err", "Patch error: encrypted " }, { "mod-err", "Patch error: other " }, { "attach-reqs", "Attach Request count " }, -- To view, visit https://gerrit.osmocom.org/10555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66a7e044c027672adf77fbd6c0a111c43ee31b4f Gerrit-Change-Number: 10555 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:49 +0000 Subject: Change in osmo-iuh[master]: fix decoding of incoming X.213 NSAP addr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10545 ) Change subject: fix decoding of incoming X.213 NSAP addr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 Gerrit-Change-Number: 10545 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:21:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:21:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:21:50 +0000 Subject: Change in osmo-iuh[master]: fix decoding of incoming X.213 NSAP addr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10545 ) Change subject: fix decoding of incoming X.213 NSAP addr ...................................................................... fix decoding of incoming X.213 NSAP addr Fix ranap_transp_layer_addr_decode() to test == 7 instead of > 7: If a femto cell sends its Transport Layer Address as X.213 NSAP IPv4, we receive 3 header bytes and four IP-address bytes, so the length is exactly 7. This function is very vague on numerous other decoding details, but this patch only fixes the vital length check that makes 3G usable with X.213 NSAP. Related: OS#3420 Change-Id: I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 --- M src/iu_helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 5e78293..39b0521 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -109,7 +109,7 @@ buf = trasp_layer_addr->buf; len = trasp_layer_addr->size; - if (buf[0] == 0x35 && len > 7) + if (buf[0] == 0x35 && len == 7) rc = inet_ntop(AF_INET, buf + 3, addr, addr_len); else if (len > 3) rc = inet_ntop(AF_INET, buf, addr, addr_len); -- To view, visit https://gerrit.osmocom.org/10545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 Gerrit-Change-Number: 10545 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:22:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:22:40 +0000 Subject: Change in libosmocore[master]: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10541 ) Change subject: vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release ...................................................................... vty: Makefile: Fix LIBVERSION typo introduced in 0.12.0 release Setting age to 5 is cleary an error, it should be increment by one instead as APIs were added 0.11->0.12 and none modified or removed. Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 --- M src/vty/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 5d0ded7..49813c5 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=5:0:5 +LIBVERSION=5:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/10541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b3bc808349bc2f949ef9eef64f39e7202ddf946 Gerrit-Change-Number: 10541 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:22:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:22:47 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to 0.12.1 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10544 ) Change subject: libosmocore: Update to 0.12.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I94c56ea74ca2726c56caf2b95f55b0998ff753dc Gerrit-Change-Number: 10544 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 20 Aug 2018 20:22:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:22:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:22:49 +0000 Subject: Change in meta-telephony[201705]: libosmocore: Update to 0.12.1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10544 ) Change subject: libosmocore: Update to 0.12.1 ...................................................................... libosmocore: Update to 0.12.1 Change-Id: I94c56ea74ca2726c56caf2b95f55b0998ff753dc --- M recipes-osmocom/libosmocore/libosmocore_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 9aedec1..09ac239 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "924ef0bc72c1be165e8d5c22859f8b4eddbc0f06" +SRCREV = "f36e0abb9796530a80937057eed2985f652d37f2" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "0.12.0+gitr${SRCPV}" +PV = "0.12.1+gitr${SRCPV}" PR = "r0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" -- To view, visit https://gerrit.osmocom.org/10544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: I94c56ea74ca2726c56caf2b95f55b0998ff753dc Gerrit-Change-Number: 10544 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:16 +0000 Subject: Change in libosmocore[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10537 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibc1d3746f1876ac42d6b1faf0e5f83bd2283cdcc Gerrit-Change-Number: 10537 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:23:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:19 +0000 Subject: Change in libosmocore[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10537 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: Ibc1d3746f1876ac42d6b1faf0e5f83bd2283cdcc --- M include/osmocom/core/fsm.h M include/osmocom/core/logging.h M include/osmocom/core/utils.h M include/osmocom/gsm/mncc.h M src/gb/gprs_ns.c 5 files changed, 15 insertions(+), 15 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 9e1062f..54bbad5 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -178,7 +178,7 @@ */ #define osmo_fsm_inst_state_chg(fi, new_state, timeout_secs, T) \ _osmo_fsm_inst_state_chg(fi, new_state, timeout_secs, T, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) int _osmo_fsm_inst_state_chg(struct osmo_fsm_inst *fi, uint32_t new_state, unsigned long timeout_secs, int T, const char *file, int line); @@ -194,7 +194,7 @@ */ #define osmo_fsm_inst_state_chg_keep_timer(fi, new_state) \ _osmo_fsm_inst_state_chg_keep_timer(fi, new_state, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) int _osmo_fsm_inst_state_chg_keep_timer(struct osmo_fsm_inst *fi, uint32_t new_state, const char *file, int line); @@ -205,7 +205,7 @@ * purposes. See there for documentation. */ #define osmo_fsm_inst_dispatch(fi, event, data) \ - _osmo_fsm_inst_dispatch(fi, event, data, __BASE_FILE__, __LINE__) + _osmo_fsm_inst_dispatch(fi, event, data, __FILE__, __LINE__) int _osmo_fsm_inst_dispatch(struct osmo_fsm_inst *fi, uint32_t event, void *data, const char *file, int line); @@ -216,7 +216,7 @@ * See there for documentation. */ #define osmo_fsm_inst_term(fi, cause, data) \ - _osmo_fsm_inst_term(fi, cause, data, __BASE_FILE__, __LINE__) + _osmo_fsm_inst_term(fi, cause, data, __FILE__, __LINE__) void _osmo_fsm_inst_term(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause, void *data, const char *file, int line); @@ -228,7 +228,7 @@ * purposes. See there for documentation. */ #define osmo_fsm_inst_term_children(fi, cause, data) \ - _osmo_fsm_inst_term_children(fi, cause, data, __BASE_FILE__, __LINE__) + _osmo_fsm_inst_term_children(fi, cause, data, __FILE__, __LINE__) void _osmo_fsm_inst_term_children(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause, void *data, diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index e68f618..3cae63d 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -55,17 +55,17 @@ #define LOGPC(ss, level, fmt, args...) \ do { \ if (log_check_level(ss, level)) \ - logp2(ss, level, __BASE_FILE__, __LINE__, 1, fmt, ##args); \ + logp2(ss, level, __FILE__, __LINE__, 1, fmt, ##args); \ } while(0) /*! Log through the Osmocom logging framework with explicit source. - * If caller_file is passed as NULL, __BASE_FILE__ and __LINE__ are used + * If caller_file is passed as NULL, __FILE__ and __LINE__ are used * instead of caller_file and caller_line (so that this macro here defines * both cases in the same place, and to catch cases where callers fail to pass * a non-null filename string). * \param[in] ss logging subsystem (e.g. \ref DLGLOBAL) * \param[in] level logging level (e.g. \ref LOGL_NOTICE) - * \param[in] caller_file caller's source file string (e.g. __BASE_FILE__) + * \param[in] caller_file caller's source file string (e.g. __FILE__) * \param[in] caller_line caller's source line nr (e.g. __LINE__) * \param[in] fmt format string * \param[in] args variable argument list @@ -74,13 +74,13 @@ LOGPSRCC(ss, level, caller_file, caller_line, 0, fmt, ##args) /*! Log through the Osmocom logging framework with explicit source. - * If caller_file is passed as NULL, __BASE_FILE__ and __LINE__ are used + * If caller_file is passed as NULL, __FILE__ and __LINE__ are used * instead of caller_file and caller_line (so that this macro here defines * both cases in the same place, and to catch cases where callers fail to pass * a non-null filename string). * \param[in] ss logging subsystem (e.g. \ref DLGLOBAL) * \param[in] level logging level (e.g. \ref LOGL_NOTICE) - * \param[in] caller_file caller's source file string (e.g. __BASE_FILE__) + * \param[in] caller_file caller's source file string (e.g. __FILE__) * \param[in] caller_line caller's source line nr (e.g. __LINE__) * \param[in] cont continuation (1) or new line (0) * \param[in] fmt format string @@ -92,7 +92,7 @@ if (caller_file) \ logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \ else \ - logp2(ss, level, __BASE_FILE__, __LINE__, cont, fmt, ##args); \ + logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \ }\ } while(0) diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index dd4461c..e2d5134 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -78,7 +78,7 @@ */ #define OSMO_ASSERT(exp) \ if (!(exp)) { \ - osmo_panic("Assert failed %s %s:%d\n", #exp, __BASE_FILE__, __LINE__); \ + osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \ } /*! duplicate a string using talloc and release its prior content (if any) diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h index 6b94d46..7e7d12c 100644 --- a/include/osmocom/gsm/mncc.h +++ b/include/osmocom/gsm/mncc.h @@ -90,7 +90,7 @@ const uint8_t *msg, unsigned int len); #define osmo_mncc_log(ss, level, prefix, msg, len) \ - _osmo_mncc_log(ss, level, __BASE_FILE__, __LINE__, prefix, msg, len); + _osmo_mncc_log(ss, level, __FILE__, __LINE__, prefix, msg, len); extern const struct value_string osmo_mncc_names[]; static inline const char *osmo_mncc_name(uint32_t msg_type) { diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 75c3141..9b7cc05 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -87,8 +87,8 @@ #include "common_vty.h" -#define ns_set_state(ns_, st_) ns_set_state_with_log(ns_, st_, false, __BASE_FILE__, __LINE__) -#define ns_set_remote_state(ns_, st_) ns_set_state_with_log(ns_, st_, true, __BASE_FILE__, __LINE__) +#define ns_set_state(ns_, st_) ns_set_state_with_log(ns_, st_, false, __FILE__, __LINE__) +#define ns_set_remote_state(ns_, st_) ns_set_state_with_log(ns_, st_, true, __FILE__, __LINE__) #define ns_mark_blocked(ns_) ns_set_state(ns_, (ns_)->state | NSE_S_BLOCKED) #define ns_mark_unblocked(ns_) ns_set_state(ns_, (ns_)->state & (~NSE_S_BLOCKED)); -- To view, visit https://gerrit.osmocom.org/10537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibc1d3746f1876ac42d6b1faf0e5f83bd2283cdcc Gerrit-Change-Number: 10537 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:24 +0000 Subject: Change in osmo-msc[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10539 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1c8122c909938daaf782468c1c5b0262d555c3ce Gerrit-Change-Number: 10539 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:23:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:25 +0000 Subject: Change in osmo-msc[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10539 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: I1c8122c909938daaf782468c1c5b0262d555c3ce --- M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/vlr.h 2 files changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 995b195..7b3702a 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -101,9 +101,9 @@ { return get_value_string(msc_subscr_conn_use_names, val); } #define msc_subscr_conn_get(conn, balance_token) \ - _msc_subscr_conn_get(conn, balance_token, __BASE_FILE__, __LINE__) + _msc_subscr_conn_get(conn, balance_token, __FILE__, __LINE__) #define msc_subscr_conn_put(conn, balance_token) \ - _msc_subscr_conn_put(conn, balance_token, __BASE_FILE__, __LINE__) + _msc_subscr_conn_put(conn, balance_token, __FILE__, __LINE__) struct gsm_subscriber_connection * _msc_subscr_conn_get(struct gsm_subscriber_connection *conn, enum msc_subscr_conn_use balance_token, diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 91c28db..386a548 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -326,19 +326,19 @@ const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub); #define vlr_subscr_find_by_imsi(vlr, imsi) \ - _vlr_subscr_find_by_imsi(vlr, imsi, __BASE_FILE__, __LINE__) + _vlr_subscr_find_by_imsi(vlr, imsi, __FILE__, __LINE__) #define vlr_subscr_find_or_create_by_imsi(vlr, imsi, created) \ _vlr_subscr_find_or_create_by_imsi(vlr, imsi, created, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) #define vlr_subscr_find_by_tmsi(vlr, tmsi) \ - _vlr_subscr_find_by_tmsi(vlr, tmsi, __BASE_FILE__, __LINE__) + _vlr_subscr_find_by_tmsi(vlr, tmsi, __FILE__, __LINE__) #define vlr_subscr_find_or_create_by_tmsi(vlr, tmsi, created) \ _vlr_subscr_find_or_create_by_tmsi(vlr, tmsi, created, \ - __BASE_FILE__, __LINE__) + __FILE__, __LINE__) #define vlr_subscr_find_by_msisdn(vlr, msisdn) \ - _vlr_subscr_find_by_msisdn(vlr, msisdn, __BASE_FILE__, __LINE__) + _vlr_subscr_find_by_msisdn(vlr, msisdn, __FILE__, __LINE__) struct vlr_subscr *_vlr_subscr_find_by_imsi(struct vlr_instance *vlr, const char *imsi, @@ -362,8 +362,8 @@ const char *msisdn, const char *file, int line); -#define vlr_subscr_get(sub) _vlr_subscr_get(sub, __BASE_FILE__, __LINE__) -#define vlr_subscr_put(sub) _vlr_subscr_put(sub, __BASE_FILE__, __LINE__) +#define vlr_subscr_get(sub) _vlr_subscr_get(sub, __FILE__, __LINE__) +#define vlr_subscr_put(sub) _vlr_subscr_put(sub, __FILE__, __LINE__) struct vlr_subscr *_vlr_subscr_get(struct vlr_subscr *sub, const char *file, int line); struct vlr_subscr *_vlr_subscr_put(struct vlr_subscr *sub, const char *file, int line); -- To view, visit https://gerrit.osmocom.org/10539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1c8122c909938daaf782468c1c5b0262d555c3ce Gerrit-Change-Number: 10539 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:28 +0000 Subject: Change in osmo-bsc[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10538 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic6d9dafc96c9d467ae53be2cd41adcf26a4e5125 Gerrit-Change-Number: 10538 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:23:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:29 +0000 Subject: Change in osmo-bsc[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10538 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: Ic6d9dafc96c9d467ae53be2cd41adcf26a4e5125 --- M include/osmocom/bsc/bsc_subscriber.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index a7b3e53..93b3539 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -37,8 +37,8 @@ const char *file, int line); struct bsc_subscr *_bsc_subscr_put(struct bsc_subscr *bsub, const char *file, int line); -#define bsc_subscr_get(bsub) _bsc_subscr_get(bsub, __BASE_FILE__, __LINE__) -#define bsc_subscr_put(bsub) _bsc_subscr_put(bsub, __BASE_FILE__, __LINE__) +#define bsc_subscr_get(bsub) _bsc_subscr_get(bsub, __FILE__, __LINE__) +#define bsc_subscr_put(bsub) _bsc_subscr_put(bsub, __FILE__, __LINE__) void log_set_filter_bsc_subscr(struct log_target *target, struct bsc_subscr *bsub); -- To view, visit https://gerrit.osmocom.org/10538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic6d9dafc96c9d467ae53be2cd41adcf26a4e5125 Gerrit-Change-Number: 10538 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:34 +0000 Subject: Change in osmo-sgsn[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10540 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icdf7af7a31fbba9197b3711eaf102fc0ae333bcc Gerrit-Change-Number: 10540 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:23:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:23:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:23:35 +0000 Subject: Change in osmo-sgsn[master]: use __FILE__, not __BASE_FILE__ In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10540 ) Change subject: use __FILE__, not __BASE_FILE__ ...................................................................... use __FILE__, not __BASE_FILE__ The intention was to use the file's basename, but __BASE_FILE__ means "the root file that is being parsed and contains #include statements". If we had a function using __BASE_FILE__ and that was defined in an #included file, __BASE_FILE__ would indicate the first file where the #include is, and not the file where the function is defined. __BASE_FILE__ works for us because we don't ever include function definitions that log something, so __BASE_FILE__ always coincides with __FILE__ for our logging; but still __BASE_FILE__ is semantically the wrong constant. Related: OS#2740 Change-Id: Icdf7af7a31fbba9197b3711eaf102fc0ae333bcc --- M include/osmocom/sgsn/gprs_subscriber.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_subscriber.h b/include/osmocom/sgsn/gprs_subscriber.h index be78feb..d36db75 100644 --- a/include/osmocom/sgsn/gprs_subscriber.h +++ b/include/osmocom/sgsn/gprs_subscriber.h @@ -27,5 +27,5 @@ const char *file, int line); struct gprs_subscr *_gprs_subscr_put(struct gprs_subscr *gsub, const char *file, int line); -#define gprs_subscr_get(gsub) _gprs_subscr_get(gsub, __BASE_FILE__, __LINE__) -#define gprs_subscr_put(gsub) _gprs_subscr_put(gsub, __BASE_FILE__, __LINE__) +#define gprs_subscr_get(gsub) _gprs_subscr_get(gsub, __FILE__, __LINE__) +#define gprs_subscr_put(gsub) _gprs_subscr_put(gsub, __FILE__, __LINE__) -- To view, visit https://gerrit.osmocom.org/10540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icdf7af7a31fbba9197b3711eaf102fc0ae333bcc Gerrit-Change-Number: 10540 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:27:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:27:54 +0000 Subject: Change in osmo-bts[master]: measurement: make sure measurement interval end is detected In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10492 ) Change subject: measurement: make sure measurement interval end is detected ...................................................................... Patch Set 2: Code-Review+2 (3 comments) looks good to me, thanks for your changes! https://gerrit.osmocom.org/#/c/10492/1/include/osmo-bts/gsm_data_shared.h File include/osmo-bts/gsm_data_shared.h: https://gerrit.osmocom.org/#/c/10492/1/include/osmo-bts/gsm_data_shared.h at 263 PS1, Line 263: measurement > measurement Done https://gerrit.osmocom.org/#/c/10492/1/include/osmo-bts/gsm_data_shared.h at 264 PS1, Line 264: last_fn > I can see you are writing to this field, but I cannot see that you ever reset/reinitialize it after [?] Done https://gerrit.osmocom.org/#/c/10492/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10492/1/src/common/measurement.c at 280 PS1, Line 280: ak; > what about the start condition? lchan->meas. [?] Done -- To view, visit https://gerrit.osmocom.org/10492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Gerrit-Change-Number: 10492 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:27:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:28:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:28:12 +0000 Subject: Change in osmo-bts[master]: measurement: make sure state is reset on chan act. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10554 ) Change subject: measurement: make sure state is reset on chan act. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I880ae3030df6dcd60c32b7144c3430528429bdea Gerrit-Change-Number: 10554 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:28:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:28:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:28:14 +0000 Subject: Change in osmo-bts[master]: measurement: make sure state is reset on chan act. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10554 ) Change subject: measurement: make sure state is reset on chan act. ...................................................................... measurement: make sure state is reset on chan act. At the moment only lchan_meas_reset is reset on channel activation. All other states are not reset. This may lead to irretations in the first measurement interval if there are still leftover messages from a previous connection. Lets ensure everything is reset to zero by zeroing out the whole .meas struct in struct lchan. - Add a centralized function that does the reset - Call that function from rsl_tx_chan_act_ack() in rsl.c Change-Id: I880ae3030df6dcd60c32b7144c3430528429bdea Related: OS#2975 Related: OS#2987 --- M include/osmo-bts/measurement.h M src/common/measurement.c M src/common/rsl.c 3 files changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 283b0ff..d98e9f0 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -10,4 +10,6 @@ void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn); +void lchan_meas_reset(struct gsm_lchan *lchan); + #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index a75b54d..bd2c0b7 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -490,3 +490,11 @@ * measurment report at Meas period End */ lchan_meas_check_compute(lchan, fn); } + +/* Reset all measurement related struct members to their initial values. This + * function will be called every time an lchan is activated to ensure the + * measurement process starts with a defined state. */ +void lchan_meas_reset(struct gsm_lchan *lchan) +{ + memset(&lchan->meas, 0, sizeof(lchan->meas)); +} diff --git a/src/common/rsl.c b/src/common/rsl.c index a24c444..ff2d997 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -750,7 +750,7 @@ msg->trx = lchan->ts->trx; /* since activation was successful, do some lchan initialization */ - lchan->meas.res_nr = 0; + lchan_meas_reset(lchan); return abis_bts_rsl_sendmsg(msg); } -- To view, visit https://gerrit.osmocom.org/10554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I880ae3030df6dcd60c32b7144c3430528429bdea Gerrit-Change-Number: 10554 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:29:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:29:54 +0000 Subject: Change in libosmo-sccp[master]: ipa_asp_fsm: init: expect IPA ID ACK, not GET In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10162 ) Change subject: ipa_asp_fsm: init: expect IPA ID ACK, not GET ...................................................................... Patch Set 2: Code-Review+2 I'm not entirely happy about unconditionally merging this. I would suggest to review various pcap files of IPA establishment against different peer implementations and then try to understnd what's really the right thing to do. However, given that the IPA code in this specific implementation is currently not used at all, I'm happy to say "I don't care [yet]". -- To view, visit https://gerrit.osmocom.org/10162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icffda98579e676ab6ca63c9c22cf5d151c4fe95f Gerrit-Change-Number: 10162 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:29:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:43:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 20:43:00 +0000 Subject: Change in osmo-mgw[master]: fix handling of "Wrong domain name" error Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10556 Change subject: fix handling of "Wrong domain name" error ...................................................................... fix handling of "Wrong domain name" error If no endpoint was found, assert that the cause code indicates error, so that the remaining code path doesn't assume finding an endpoint was successful. Also fix find_endpoint() to return an error cause (not 0) in case it finds the domain name to be wrong. After this, the error described in OS#3488 simply results in a CRCX failure, not in a program crash. Related: OS#3488 Change-Id: I87e2d76c22603d6fef89907c3cf8f7965abf35a0 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/56/10556/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 8d22cc5..7378ddc 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -241,6 +241,7 @@ /* Check if the domainname in the request is correct */ if (check_domain_name(cfg, mgcp)) { LOGP(DLMGCP, LOGL_ERROR, "Wrong domain name '%s'\n", mgcp); + *cause = -500; return NULL; } @@ -320,6 +321,7 @@ if (!pdata->endp) { LOGP(DLMGCP, LOGL_ERROR, "Unable to find Endpoint `%s'\n", elem); + OSMO_ASSERT(cause < 0); return cause; } break; -- To view, visit https://gerrit.osmocom.org/10556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I87e2d76c22603d6fef89907c3cf8f7965abf35a0 Gerrit-Change-Number: 10556 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 20:45:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 20 Aug 2018 20:45:38 +0000 Subject: Change in osmo-mgw[master]: fix handling of "Wrong domain name" error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10556 ) Change subject: fix handling of "Wrong domain name" error ...................................................................... Patch Set 1: Code-Review+2 adding a TTCN3 test would be great -- To view, visit https://gerrit.osmocom.org/10556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I87e2d76c22603d6fef89907c3cf8f7965abf35a0 Gerrit-Change-Number: 10556 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 20 Aug 2018 20:45:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 20 21:01:16 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 20 Aug 2018 21:01:16 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b7b2c3385bfb_6357dac67c230542@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/armv7l Package network:osmocom:latest/openbsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: getsources: syswrite: (worker was obs-arm-5:2) gave up after 17 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 20 21:45:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 21:45:46 +0000 Subject: Change in libosmo-sccp[master]: ipa_asp_fsm: init: expect IPA ID ACK, not GET In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10162 ) Change subject: ipa_asp_fsm: init: expect IPA ID ACK, not GET ...................................................................... Patch Set 2: I agree; am just seeing the one implementation I have at hand now, and making the code match that... -- To view, visit https://gerrit.osmocom.org/10162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icffda98579e676ab6ca63c9c22cf5d151c4fe95f Gerrit-Change-Number: 10162 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 20 Aug 2018 21:45:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 21:46:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 21:46:05 +0000 Subject: Change in libosmo-sccp[master]: ipa_asp_fsm: init: expect IPA ID ACK, not GET In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10162 ) Change subject: ipa_asp_fsm: init: expect IPA ID ACK, not GET ...................................................................... ipa_asp_fsm: init: expect IPA ID ACK, not GET Testing with an actual SCCPlite MSC, I see the IPA connection starting out by the MSC sending an IPA ID ACK. Make the ipa_asp_fsm match that. Change-Id: Icffda98579e676ab6ca63c9c22cf5d151c4fe95f --- M src/xua_asp_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 78a4f25..d6edac0 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -785,7 +785,7 @@ } } else { /* Client: We simply wait for an ID GET */ - osmo_fsm_inst_state_chg(fi, IPA_ASP_S_WAIT_ID_GET, 10, T_WAIT_ID_GET); + osmo_fsm_inst_state_chg(fi, IPA_ASP_S_WAIT_ID_ACK, 10, T_WAIT_ID_ACK); } break; } @@ -985,7 +985,7 @@ [IPA_ASP_S_DOWN] = { .in_event_mask = S(XUA_ASP_E_M_ASP_UP_REQ) | S(XUA_ASP_E_SCTP_EST_IND), - .out_state_mask = S(IPA_ASP_S_WAIT_ID_GET) | + .out_state_mask = S(IPA_ASP_S_WAIT_ID_ACK) | S(IPA_ASP_S_WAIT_ID_RESP), .name = "ASP_DOWN", .action = ipa_asp_fsm_down, -- To view, visit https://gerrit.osmocom.org/10162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icffda98579e676ab6ca63c9c22cf5d151c4fe95f Gerrit-Change-Number: 10162 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 21:46:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 21:46:58 +0000 Subject: Change in osmo-mgw[master]: fix handling of "Wrong domain name" error In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10556 ) Change subject: fix handling of "Wrong domain name" error ...................................................................... fix handling of "Wrong domain name" error If no endpoint was found, assert that the cause code indicates error, so that the remaining code path doesn't assume finding an endpoint was successful. Also fix find_endpoint() to return an error cause (not 0) in case it finds the domain name to be wrong. After this, the error described in OS#3488 simply results in a CRCX failure, not in a program crash. Related: OS#3488 Change-Id: I87e2d76c22603d6fef89907c3cf8f7965abf35a0 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 8d22cc5..7378ddc 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -241,6 +241,7 @@ /* Check if the domainname in the request is correct */ if (check_domain_name(cfg, mgcp)) { LOGP(DLMGCP, LOGL_ERROR, "Wrong domain name '%s'\n", mgcp); + *cause = -500; return NULL; } @@ -320,6 +321,7 @@ if (!pdata->endp) { LOGP(DLMGCP, LOGL_ERROR, "Unable to find Endpoint `%s'\n", elem); + OSMO_ASSERT(cause < 0); return cause; } break; -- To view, visit https://gerrit.osmocom.org/10556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I87e2d76c22603d6fef89907c3cf8f7965abf35a0 Gerrit-Change-Number: 10556 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 22:04:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 22:04:48 +0000 Subject: Change in osmo-mgw[master]: interpret domain '*' as 'allow any domain' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10557 Change subject: interpret domain '*' as 'allow any domain' ...................................................................... interpret domain '*' as 'allow any domain' Make the 'domain NAME' vty doc more descriptive, and add the hint that '*' means any domain. In check_domain_name(), exit early in success if the configured domain name is '*'. (Do not implement other wildcard functionality for partial matches or the like, just the single '*'.) Related: OS#3490 Change-Id: Ie0220c88d2f5cee15f2a90390b3c4590ac61d5eb --- M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_vty.c 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/10557/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 7378ddc..a89c579 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -219,6 +219,10 @@ if (!domain_to_check) return -EINVAL; + /* Accept any domain if configured as "*" */ + if (!strcmp(cfg->domain, "*")) + return 0; + if (strcmp(domain_to_check+1, cfg->domain) != 0) return -EINVAL; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index ad462b7..00af3bd 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -1208,7 +1208,9 @@ DEFUN(cfg_mgcp_domain, cfg_mgcp_domain_cmd, - "domain NAME", "domain\n" "qualified domain name\n") + "domain NAME", + "Set the domain part expected in MGCP messages' endpoint names\n" + "Qualified domain name expected in MGCP endpoint names, or '*' to accept any domain\n") { osmo_strlcpy(g_cfg->domain, argv[0], sizeof(g_cfg->domain)); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/10557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0220c88d2f5cee15f2a90390b3c4590ac61d5eb Gerrit-Change-Number: 10557 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 22:04:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 22:04:49 +0000 Subject: Change in osmo-mgw[master]: cosmetic: log: fix "CallIDs does not match" Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10558 Change subject: cosmetic: log: fix "CallIDs does not match" ...................................................................... cosmetic: log: fix "CallIDs does not match" Change-Id: I16f3bf1312f913b7a7f0d9ff5c42efa645c6a5b3 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/58/10558/1 diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index a89c579..a5bef7b 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -414,7 +414,7 @@ if (strcmp(endp->callid, callid) != 0) { LOGP(DLMGCP, LOGL_ERROR, - "endpoint:0x%x CallIDs does not match '%s' != '%s'\n", + "endpoint:0x%x CallIDs mismatch: '%s' != '%s'\n", ENDPOINT_NUMBER(endp), endp->callid, callid); return -1; } -- To view, visit https://gerrit.osmocom.org/10558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I16f3bf1312f913b7a7f0d9ff5c42efa645c6a5b3 Gerrit-Change-Number: 10558 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 23:55:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 23:55:18 +0000 Subject: Change in osmo-bsc[master]: fix lchan_rtp_fsm: missing event handling Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10559 Change subject: fix lchan_rtp_fsm: missing event handling ...................................................................... fix lchan_rtp_fsm: missing event handling Release and Rollback events are allowed but unhandled in states WAIT_MGW_CONFIGURED and ROLLBACK, and hence would result in an assertion. Add handling in these states. Change-Id: Iab233c592384902098644eee27bb8445fde3aa6f --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/10559/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 2cc9a78..091af5e 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -467,6 +467,14 @@ lchan_rtp_fail("Error while redirecting the MGW to the lchan's RTP port"); return; + case LCHAN_RTP_EV_ROLLBACK: + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_ROLLBACK); + return; + + case LCHAN_RTP_EV_RELEASE: + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, 0); + return; + default: OSMO_ASSERT(false); } @@ -533,6 +541,11 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, 0); return; + case LCHAN_RTP_EV_RELEASE: + case LCHAN_RTP_EV_ROLLBACK: + /* Already rolling back, ignore. */ + return; + default: OSMO_ASSERT(false); } -- To view, visit https://gerrit.osmocom.org/10559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iab233c592384902098644eee27bb8445fde3aa6f Gerrit-Change-Number: 10559 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 23:55:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 23:55:22 +0000 Subject: Change in osmo-bsc[master]: HACK: omit callid for sccplite Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10560 Change subject: HACK: omit callid for sccplite ...................................................................... HACK: omit callid for sccplite goes along with I4598f5653b10416cfd439bf6acded77f6489fb3b (osmo-mgw) Change-Id: Ia9de21f7fc60e5157689d8c72b88f71d7e210b24 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/10560/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 32375d4..0e59859 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -489,6 +489,7 @@ mgw_info = (struct mgcp_conn_peer){ .port = port, .call_id = conn->sccp.conn_id, + .call_id_present = true, .ptime = 20, }; mgcp_pick_codec(&mgw_info, for_lchan, false); diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 091af5e..609c912 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -154,8 +154,10 @@ lchan->mgw_endpoint_ci_bts = mgw_endpoint_ci_add(mgwep, "to-BTS"); - if (lchan->conn) + if (gscon_is_aoip(lchan->conn)) { crcx_info.call_id = lchan->conn->sccp.conn_id; + crcx_info.call_id_present = true; + } crcx_info.ptime = 20; mgcp_pick_codec(&crcx_info, lchan, true); -- To view, visit https://gerrit.osmocom.org/10560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9de21f7fc60e5157689d8c72b88f71d7e210b24 Gerrit-Change-Number: 10560 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 20 23:55:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 20 Aug 2018 23:55:41 +0000 Subject: Change in osmo-bsc[master]: HACK: omit callid for sccplite In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/10560 ) Change subject: HACK: omit callid for sccplite ...................................................................... Abandoned accidental push -- To view, visit https://gerrit.osmocom.org/10560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia9de21f7fc60e5157689d8c72b88f71d7e210b24 Gerrit-Change-Number: 10560 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 07:57:07 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 21 Aug 2018 07:57:07 +0000 Subject: Change in osmo-bts[master]: measurement: make sure measurement interval end is detected In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/10492 ) Change subject: measurement: make sure measurement interval end is detected ...................................................................... measurement: make sure measurement interval end is detected the measurement interval end is detected by using the measurement indication that is related to the SACCH block as a trigger to start the computation. If the measurement indication for the SACCH gets lost because the block could not be received then the processing is not executed. This may cause wrong results or when it happens condecutively an overflow of the measurement sample buffer. - Store the frame number of the last received measurement indication - Use the stored frame number to check if an interval was crossed when the next measurement indication is received. If we detect that we missed the interval, catch up by running the computation and start the next interval. Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Related: OS#2975 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 5 files changed, 1,071 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index baa0145..794eaea 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -260,6 +260,8 @@ uint8_t l1_info[2]; struct gsm_meas_rep_unidir ul_res; int16_t ms_toa256; + /* Frame number of the last measurement indication receceived */ + uint32_t last_fn; /* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */ struct { /* minimum value of toa256 during measurement period */ diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index d98e9f0..57eeef5 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -12,4 +12,6 @@ void lchan_meas_reset(struct gsm_lchan *lchan); +bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn); + #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index bd2c0b7..41844b1 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -9,6 +9,7 @@ #include #include #include +#include /* Tables as per TS 45.008 Section 8.3 */ static const uint8_t ts45008_83_tch_f[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; @@ -217,6 +218,32 @@ return 0; } +/* Same as above, but the inverse function */ +static uint8_t translate_tch_meas_rep_fn104_inv(uint8_t fn_mod) +{ + switch (fn_mod) { + case 103: + return 25; + case 12: + return 38; + case 25: + return 51; + case 38: + return 64; + case 51: + return 77; + case 64: + return 90; + case 77: + return 103; + case 90: + return 12; + } + + /* Invalid / not of interest */ + return 0; +} + /* determine if a measurement period ends at the given frame number */ static int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn) { @@ -271,7 +298,101 @@ return rc; } -/* receive a L1 uplink measurement from L1 */ +/* Check if a measurement period is overdue. This situation may occur when the + * SACCH frame that closes the measurement interval was not received. Then the + * end of the measurement will not be detected. Using this function we can + * detect if we missed a measurement period end and we also find the frame + * number of the lost SACCH frame. (this function is only used internally, + * it is public to call it from unit-tests) */ +bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn) +{ + uint32_t fn_mod; + uint32_t last_fn_mod; + uint8_t interval_end; + uint8_t modulus; + const uint8_t *tbl; + enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); + + /* On the very first measurement we will not be able to do this check + * as we do not have a reference yet. So we have to assume that we + * did not miss the interval end yet. */ + if (lchan->meas.last_fn == LCHAN_FN_DUMMY) + return false; + + /* Determine the interval ending and the modulus to calculate with */ + switch (pchan) { + case GSM_PCHAN_TCH_F: + modulus = 104; + interval_end = tchf_meas_rep_fn104[lchan->ts->nr]; + interval_end = translate_tch_meas_rep_fn104_inv(interval_end); + break; + case GSM_PCHAN_TCH_H: + modulus = 104; + last_fn_mod = lchan->meas.last_fn % 104; + if (lchan->nr == 0) + tbl = tchh0_meas_rep_fn104; + else + tbl = tchh1_meas_rep_fn104; + interval_end = tbl[lchan->ts->nr]; + interval_end = translate_tch_meas_rep_fn104_inv(interval_end); + break; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + modulus = 102; + last_fn_mod = lchan->meas.last_fn % 102; + interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; + break; + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + modulus = 102; + interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; + break; + default: + return false; + break; + } + + fn_mod = fn % modulus; + last_fn_mod = lchan->meas.last_fn % modulus; + + if (fn_mod > last_fn_mod) { + /* When the current frame number is larger then the last frame + * number we check if the interval ending falls in between + * the two. If it does we calculate the absolute frame number + * position on which the interval should have ended. */ + if (interval_end > last_fn_mod && interval_end < fn_mod) { + *fn_missed_end = interval_end + fn - fn_mod; + return true; + } + } else { + /* When the current frame number is smaller then the last frame + * number, than the modulus interval has wrapped. We then just + * check the presence of the interval ending in the section + * that starts at the current frame number and ends at the + * interval end. */ + if (interval_end > last_fn_mod) { + if (fn < lchan->meas.last_fn) + *fn_missed_end = interval_end + GSM_MAX_FN - modulus; + else + *fn_missed_end = interval_end + fn - modulus; + return true; + } + /* We also check the section that starts from the beginning of + * the interval and ends at the current frame number. */ + if (interval_end < fn_mod) { + if (fn < lchan->meas.last_fn) + *fn_missed_end = interval_end; + else + *fn_missed_end = interval_end + fn - fn_mod; + return true; + } + } + + return false; +} + +/* receive a L1 uplink measurement from L1 (this function is only used + * internally, it is public to call it from unit-tests) */ int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { if (lchan->state != LCHAN_S_ACTIVE) { @@ -299,6 +420,8 @@ memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm, sizeof(*ulm)); + lchan->meas.last_fn = fn; + return 0; } @@ -484,11 +607,31 @@ * interval. */ void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn) { - lchan_new_ul_meas(lchan, ulm, fn); + uint32_t fn_missed_end; + bool missed_end; - /* Check measurement period end and prepare the UL - * measurment report at Meas period End */ - lchan_meas_check_compute(lchan, fn); + /* The measurement processing detects the end of a measurement period + * by checking if the received measurement sample is from a SACCH + * block. If so, then the measurement computation is performed and the + * next cycle starts. However, when the SACCH block is not received + * then the associated measurement indication is also skipped. Because + * of this we must check now if the measurement interval ended between + * the last and the current call of this function */ + missed_end = is_meas_overdue(lchan, &fn_missed_end, fn); + + if (missed_end) { + DEBUGPFN(DMEAS, fn, "%s measurement interval ending missed, catching up...\n", gsm_lchan_name(lchan)); + /* We missed the end of the interval. Do the computation now + * and add the uplink measurement we got as the first sample + * of a new interval */ + lchan_meas_check_compute(lchan, fn_missed_end); + lchan_new_ul_meas(lchan, ulm, fn); + } else { + /* This is the normal case, we first add the measurement sample + * to the current interva and run the check+computation */ + lchan_new_ul_meas(lchan, ulm, fn); + lchan_meas_check_compute(lchan, fn); + } } /* Reset all measurement related struct members to their initial values. This @@ -497,4 +640,5 @@ void lchan_meas_reset(struct gsm_lchan *lchan) { memset(&lchan->meas, 0, sizeof(lchan->meas)); + lchan->meas.last_fn = LCHAN_FN_DUMMY; } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 2ba44d3..d40d7cd 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -9,6 +9,7 @@ #include #include #include +#include static struct gsm_bts *bts; struct gsm_bts_trx *trx; @@ -117,6 +118,434 @@ } +/* This tests the function is_meas_overdue() and since is_meas_overdue() + * internally makes use of is_meas_complete(), this also gives + * is_meas_complete() a detailed check. */ +static void test_is_meas_overdue(void) +{ + struct gsm_lchan *lchan; + bool rc; + uint32_t fn_missed_end; + unsigned int i; + + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing is_meas_overdue() and is_meas_complete()\n"); + + /* Missing period-end-trigger at fn=12, TCH/F, TS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17 + 104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 12 + 104); + + /* Missing period-end-trigger at fn=12, TCH/H, TS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17 + 104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 12 + 104); + + /* Missing period-end-trigger at fn=12, TCH/H, TS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17 + 104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 12 + 104); + + /* Missing period-end-trigger at fn=25, TCH/F, TS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 25); + + /* Missing period-end-trigger at fn=25, TCH/H, TS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 25); + + /* Missing period-end-trigger at fn=25, TCH/H, TS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[1].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 21; + rc = is_meas_overdue(lchan, &fn_missed_end, 30); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 25); + + /* Missing period-end-trigger at fn=38, TCH/F, TS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38); + + /* Missing period-end-trigger at fn=38, TCH/H, TS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38); + + /* Missing period-end-trigger at fn=38, TCH/H, TS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 43); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38); + + /* Missing period-end-trigger at fn=51, TCH/F, TS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 51); + + /* Missing period-end-trigger at fn=51, TCH/H, TS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 51); + + /* Missing period-end-trigger at fn=51, TCH/H, TS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[3].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 52); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 51); + + /* Missing period-end-trigger at fn=64, TCH/F, TS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 64); + + /* Missing period-end-trigger at fn=64, TCH/H, TS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 64); + + /* Missing period-end-trigger at fn=64, TCH/H, TS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 60; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 64); + + /* Missing period-end-trigger at fn=77, TCH/F, TS5 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 77); + + /* Missing period-end-trigger at fn=77, TCH/H, TS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[4].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 77); + + /* Missing period-end-trigger at fn=77, TCH/H, TS5 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[5].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 73; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 77); + + /* Missing period-end-trigger at fn=90, TCH/F, TS6 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 90); + + /* Missing period-end-trigger at fn=90, TCH/H, TS6 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 90); + + /* Missing period-end-trigger at fn=90, TCH/H, TS7 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 91); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 90); + + /* Missing period-end-trigger at fn=103, TCH/F, TS7 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 103); + + /* Missing period-end-trigger at fn=103, TCH/H, TS6 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[6].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 103); + + /* Missing period-end-trigger at fn=103, TCH/H, TS7 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[7].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 103); + + /* Dropout inside the interval, no period-end-trigger missed */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 56; + rc = is_meas_overdue(lchan, &fn_missed_end, 69); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, but right after period-end-trigger */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 38; + rc = is_meas_overdue(lchan, &fn_missed_end, 39); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, two neigbouring frames at random position + * (should not happen in the real world) */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 43; + rc = is_meas_overdue(lchan, &fn_missed_end, 44); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, Two neigbouring frames (period end, right side) */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 38; + rc = is_meas_overdue(lchan, &fn_missed_end, 39); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, Two neigbouring frames (period end, left side, + * should not happen in the real world) */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 37; + rc = is_meas_overdue(lchan, &fn_missed_end, 38); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, test directly on a the trigger frame */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 34; + rc = is_meas_overdue(lchan, &fn_missed_end, 38); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, previous frame is trigger frame + * (should not happen in the real world) */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->meas.last_fn = 38; + rc = is_meas_overdue(lchan, &fn_missed_end, 38); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* Missing period-end-trigger at fn=38+i*104, TCH/F, TS2 to + * see the modulus is correct. */ + for (i = 0; i < 100; i++) { + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = 34 + 104 * 1; + rc = is_meas_overdue(lchan, &fn_missed_end, 43 + 104 * 1); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 38 + 104 * 1); + } + + /* See whats happening if we miss a period-end-triggerend at the + * hyperframe beginning. */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = GSM_MAX_FN-104+95; + rc = is_meas_overdue(lchan, &fn_missed_end, 17); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 12); + + /* See whats happening if we miss a period-end-triggerend at the + * hyperframe ending. */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = GSM_MAX_FN-104+86; + rc = is_meas_overdue(lchan, &fn_missed_end, 8); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == GSM_MAX_FN-104+90); + + /* See whats happening if we miss a period-end-triggerend exactly at the + * hyperframe ending. */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = GSM_MAX_FN-104+99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == GSM_MAX_FN-1); + + /* Test a wrap around at the hyperframe ending, while no measurements + * are lost */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = GSM_MAX_FN-104+99; + rc = is_meas_overdue(lchan, &fn_missed_end, 0); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* Test a wrap around at the hyperframe ending, measurements are lost, + * but not the one that triggers the period end */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = GSM_MAX_FN-104+95; + rc = is_meas_overdue(lchan, &fn_missed_end, 4); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* Test a wrap around right before the hyperframe ending, while no + * measurements are lost. */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->meas.last_fn = GSM_MAX_FN-104+99; + rc = is_meas_overdue(lchan, &fn_missed_end, GSM_MAX_FN-1); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); +} + +/* This tests the robustness of lchan_meas_process_measurement(). This is the + * function that is called from l1_sap.c each time a measurement indication is + * received. The process must still go on when measurement indications (blocks) + * are lost or otherwise spaced out. Even the complete absence of the + * measurement indications from the SACCH which are used to detect the interval + * end must not keep the interval from beeing processed. */ +void test_lchan_meas_process_measurement(bool no_sacch, bool dropouts) +{ + struct gsm_lchan *lchan = &trx->ts[2].lchan[0]; + unsigned int i; + unsigned int k = 0; + unsigned int fn = 0; + struct bts_ul_meas ulm; + + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing lchan_meas_process_measurement()\n"); + if (no_sacch) + printf(" * SACCH blocks not generated.\n"); + if (dropouts) + printf + (" * Simulate dropouts by leaving out every 4th measurement\n"); + + ulm.ber10k = 0; + ulm.ta_offs_256bits = 256; + ulm.c_i = 0; + ulm.is_sub = 0; + ulm.inv_rssi = 90; + + lchan->ts->pchan = GSM_PCHAN_TCH_F; + reset_lchan_meas(lchan); + + /* feed uplink measurements into the code */ + for (i = 0; i < 100; i++) { + + if (dropouts == false || i % 4) + lchan_meas_process_measurement(lchan, &ulm, fn); + else + printf + ("(leaving out measurement sample for frame number %u)\n", + fn); + + fn += 4; + if (k == 2) { + fn++; + k = 0; + } else + k++; + + if (fn % 104 == 39 && no_sacch == false) { + printf + ("(now adding measurement sample for SACCH block)\n"); + lchan_meas_process_measurement(lchan, &ulm, fn - 1); + } else + printf + ("(leaving out measurement sample for SACCH block)\n"); + } +} + int main(int argc, char **argv) { void *tall_bts_ctx; @@ -172,6 +601,17 @@ test_meas_compute(&mtc4); test_meas_compute(&mtc5); + printf("\n"); + printf("***************************************************\n"); + printf("*** MEASUREMENT INTERVAL ENDING DETECTION TESTS ***\n"); + printf("***************************************************\n"); + + test_is_meas_overdue(); + test_lchan_meas_process_measurement(false, false); + test_lchan_meas_process_measurement(true, false); + test_lchan_meas_process_measurement(false, true); + test_lchan_meas_process_measurement(true, true); + printf("Success\n"); return 0; diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 026899d..77b652e 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -573,4 +573,482 @@ meas.ext.toa256_std_dev | 0 | 0 meas.ul_res.full.rx_lev | 20 | 20 meas.ul_res.full.rx_qual | 0 | 0 + +*************************************************** +*** MEASUREMENT INTERVAL ENDING DETECTION TESTS *** +*************************************************** + + +=========================================================== +Testing is_meas_overdue() and is_meas_complete() + + +=========================================================== +Testing lchan_meas_process_measurement() +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) + + +=========================================================== +Testing lchan_meas_process_measurement() + * SACCH blocks not generated. +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) + + +=========================================================== +Testing lchan_meas_process_measurement() + * Simulate dropouts by leaving out every 4th measurement +(leaving out measurement sample for frame number 0) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 17) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 34) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 52) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 69) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 86) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 104) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 121) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 138) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 156) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 173) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 190) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 208) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 225) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 242) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 260) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 277) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 294) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 312) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 329) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 346) +(now adding measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 364) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 381) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 398) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 416) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) + + +=========================================================== +Testing lchan_meas_process_measurement() + * SACCH blocks not generated. + * Simulate dropouts by leaving out every 4th measurement +(leaving out measurement sample for frame number 0) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 17) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 34) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 52) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 69) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 86) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 104) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 121) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 138) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 156) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 173) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 190) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 208) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 225) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 242) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 260) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 277) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 294) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 312) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 329) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 346) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 364) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 381) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 398) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for frame number 416) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) +(leaving out measurement sample for SACCH block) Success -- To view, visit https://gerrit.osmocom.org/10492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3a86cd8185cc6b94258373fe929f0c2f1cf27cfa Gerrit-Change-Number: 10492 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 09:54:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 21 Aug 2018 09:54:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: log / comment tweaks In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/9627 ) Change subject: log / comment tweaks ...................................................................... Abandoned /me ticked "use nanoBTS definitions" -- To view, visit https://gerrit.osmocom.org/9627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c Gerrit-Change-Number: 9627 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 09:55:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 21 Aug 2018 09:55:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: log / comment tweaks In-Reply-To: References: Message-ID: Neels Hofmeyr has restored this change. ( https://gerrit.osmocom.org/9627 ) Change subject: log / comment tweaks ...................................................................... Restored -- To view, visit https://gerrit.osmocom.org/9627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: restore Gerrit-Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c Gerrit-Change-Number: 9627 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 09:58:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 21 Aug 2018 09:58:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: log / comment tweaks In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9627 to look at the new patch set (#4). Change subject: log / comment tweaks ...................................................................... log / comment tweaks BSC_Tests: sprinkle logs to illustrate what the dyn PDCH tests expect. BSC_Tests: tweak comment to mention that inter-BSC HO MT *does* allow N-CONNECT from MSC. f_tc_assignment_fr_a5_1_codec_missing: mark the missing IE beyond doubt. Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c --- M bsc/BSC_Tests.ttcn 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/9627/4 -- To view, visit https://gerrit.osmocom.org/9627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c Gerrit-Change-Number: 9627 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 12:48:18 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 21 Aug 2018 12:48:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Reliably pass TC_cr_before_reset Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10561 Change subject: MSC_Tests: Reliably pass TC_cr_before_reset ...................................................................... MSC_Tests: Reliably pass TC_cr_before_reset I was able to reproduce the sporadic cr_before_reset failures by running both osmo-{stp,msc}-master with --cpus 0.1. In that case the first test run would fail for me because no BSSMAP RESET ACK was seen. Sleeping some seconds before sending the messages will make sure all components are connected. Note: TC_cr_before_reset is the first test executed in control so this seems to be why it sometimes fails in jenkins. Change-Id: Id745470231950e0a284f8c231246d3719f7617cc --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/10561/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 42ad27c..4bdbc1d 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1765,6 +1765,8 @@ f_bssap_start(g_bssap[0]); + f_sleep(3.0); + /* Make a blind connection attemt, to trigger the deadlock condition */ BSSAP_DIRECT.send(ts_BSSAP_CONNECT_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, 1, omit)); -- To view, visit https://gerrit.osmocom.org/10561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id745470231950e0a284f8c231246d3719f7617cc Gerrit-Change-Number: 10561 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 13:04:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 21 Aug 2018 13:04:53 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10022 to look at the new patch set (#2). Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... add VTY commands which show specific mgcp endpoints Add VTY commands "show mgcp endpoint NAME" and "show mgcp trunk <0-64> endpoint NAME" which show information about specific endpoints. Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Related: OS#2660 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 112 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/22/10022/2 -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 13:07:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 21 Aug 2018 13:07:07 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10022 ) Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... Patch Set 2: Neels and I discussed this face-to-face today, and I've updated the patch set accordingly. The main changes are: There are now two new VTY commands, with and without a trunk number. Endpoint names are printed without a 0x prefix. -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 21 Aug 2018 13:07:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 13:23:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 21 Aug 2018 13:23:33 +0000 Subject: Change in osmo-mgw[master]: interpret domain '*' as 'allow any domain' In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10557 ) Change subject: interpret domain '*' as 'allow any domain' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0220c88d2f5cee15f2a90390b3c4590ac61d5eb Gerrit-Change-Number: 10557 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 21 Aug 2018 13:23:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 13:24:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 21 Aug 2018 13:24:22 +0000 Subject: Change in osmo-mgw[master]: cosmetic: log: fix "CallIDs does not match" In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10558 ) Change subject: cosmetic: log: fix "CallIDs does not match" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I16f3bf1312f913b7a7f0d9ff5c42efa645c6a5b3 Gerrit-Change-Number: 10558 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 21 Aug 2018 13:24:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 13:49:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 21 Aug 2018 13:49:38 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce scenario modifiers Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10562 Change subject: Introduce scenario modifiers ...................................................................... Introduce scenario modifiers Before this patch, scenarios were only used to select resources with specific attributes. This commit introduces "modifiers" in scenarios, which allows setting or modifing config attributes of resources once they have been reserved. This way same test can be run selecting same resources but modifying its configuration, allowing for instance running different number of TRX, different timeslot configuration, etc. Modifiers are described by placing a "modifiers" dictionary in any scenario file, similar to the current "resources" one used to select requird resources. The "modifiers" dictionary is overlaid on top of the "resources" one resulting from combining all the "resources" dictionary of all scenario files. Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d --- A example/scenarios/mod-bts0-numtrx2.conf M selftest/resource_test.ok M selftest/resource_test.py M selftest/suite_test.ok M selftest/suite_test.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/suite.py 7 files changed, 225 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/62/10562/1 diff --git a/example/scenarios/mod-bts0-numtrx2.conf b/example/scenarios/mod-bts0-numtrx2.conf new file mode 100644 index 0000000..eb24fd3 --- /dev/null +++ b/example/scenarios/mod-bts0-numtrx2.conf @@ -0,0 +1,3 @@ +modifiers: + bts: + - num_trx: 2 diff --git a/selftest/resource_test.ok b/selftest/resource_test.ok index 884c6b3..3ec922b 100644 --- a/selftest/resource_test.ok +++ b/selftest/resource_test.ok @@ -222,6 +222,54 @@ ~~~ end: currently reserved +~~~ with modifiers: +resources(testowner)={'arfcn': [{'_hash': 'e620569450f8259b3f0212ec19c285dd07df063c', + '_reserved_by': 'testowner-123-1490837279', + 'arfcn': '512', + 'band': 'GSM-1800'}, + {'_hash': '022621e513c5a5bf33b77430a1e9c886be676fa1', + '_reserved_by': 'testowner-123-1490837279', + 'arfcn': '514', + 'band': 'GSM-1800'}], + 'bts': [{'_hash': 'd2aa7c1124943de352351b650ca0c751784da6b6', + '_reserved_by': 'testowner-123-1490837279', + 'addr': '10.42.42.114', + 'band': 'GSM-1800', + 'ciphers': ['a5_0', 'a5_1'], + 'direct_pcu': 'True', + 'ipa_unit_id': '1', + 'label': 'sysmoBTS 1002', + 'type': 'osmo-bts-sysmo'}, + {'_hash': '6a9c9fbd364e1563a5b9f0826030a7888fd19575', + '_reserved_by': 'testowner-123-1490837279', + 'addr': '10.42.42.50', + 'band': 'GSM-1800', + 'ciphers': ['a5_0', 'a5_1'], + 'ipa_unit_id': '6', + 'label': 'Ettus B200', + 'launch_trx': 'True', + 'num_trx': 2, + 'type': 'osmo-bts-trx'}], + 'ip_address': [{'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c', + '_reserved_by': 'testowner-123-1490837279', + 'addr': '10.42.42.2'}], + 'modem': [{'_hash': '0b538cb6ad799fbd7c2953fd3b4463a76c7cc9c0', + '_reserved_by': 'testowner-123-1490837279', + 'auth_algo': 'comp128v1', + 'ciphers': ['a5_0', 'a5_1'], + 'imsi': '901700000009031', + 'ki': '80A37E6FDEA931EAC92FFA5F671EFEAD', + 'label': 'sierra_1', + 'path': '/sierra_1'}, + {'_hash': '3a6e7747dfe7dfdf817bd3351031bd08051605c3', + '_reserved_by': 'testowner-123-1490837279', + 'auth_algo': 'comp128v1', + 'ciphers': ['a5_0', 'a5_1'], + 'imsi': '901700000009029', + 'ki': '00969E283349D354A8239E877F2E0866', + 'label': 'sierra_2', + 'path': '/sierra_2'}]} +~~~ end: with modifiers: ~~~ currently reserved: {} diff --git a/selftest/resource_test.py b/selftest/resource_test.py index 52d8e47..cdfe021 100755 --- a/selftest/resource_test.py +++ b/selftest/resource_test.py @@ -77,16 +77,22 @@ 'arfcn': [ { 'band': 'GSM-1800', 'times': 2 } ], 'modem': [ { 'times': 2 , 'ciphers': ['a5_0', 'a5_1']} ], } - +modifiers = { + 'bts': [ {}, {'num_trx': 2 }], +} origin = log.Origin(None, 'testowner') -resources = pool.reserve(origin, config.replicate_times(want)) +resources = pool.reserve(origin, config.replicate_times(want), config.replicate_times(modifiers)) print('~~~ currently reserved:') with open(rrfile, 'r') as f: print(f.read()) print('~~~ end: currently reserved\n') +print('~~~ with modifiers:') +print(repr(resources)) +print('~~~ end: with modifiers:') + resources.free() print('~~~ currently reserved:') diff --git a/selftest/suite_test.ok b/selftest/suite_test.ok index 79c37cc..a98f987 100644 --- a/selftest/suite_test.ok +++ b/selftest/suite_test.ok @@ -34,6 +34,8 @@ tst test_suite: reserving resources in [PATH]/selftest/suite_test/test_work/state_dir ... tst test_suite: DBG: {combining='resources'} tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] +tst test_suite: DBG: {combining='modifiers'} +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] tst test_suite: Reserving 3 x bts (candidates: 6) tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 addr: 10.42.42.53 @@ -177,6 +179,9 @@ tst test_suite: DBG: {combining='resources'} [suite.py:[LINENR]] tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] [suite.py:[LINENR]] tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT] +tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]] +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] +tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 addr: 10.42.42.53 @@ -255,6 +260,9 @@ tst test_suite: DBG: {combining='resources'} [suite.py:[LINENR]] tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] [suite.py:[LINENR]] tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT] +tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]] +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] +tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 addr: 10.42.42.53 @@ -322,5 +330,128 @@ skip: test_error.py skip: test_fail.py skip: test_fail_raise.py +- test with scenario and modifiers +cnf ResourcesPool: DBG: Found config file resources.conf as [PATH]/selftest/suite_test/resources.conf in ./suite_test which is [PATH]/selftest/suite_test [config.py:[LINENR]] +cnf ResourcesPool: DBG: Found path state_dir as [PATH]/selftest/suite_test/test_work/state_dir [config.py:[LINENR]] +tst test_suite: reserving resources in [PATH]/selftest/suite_test/test_work/state_dir ... [suite.py:[LINENR]] +tst test_suite: DBG: {combining='resources'} [suite.py:[LINENR]] +tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] [suite.py:[LINENR]] +tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT] +tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]] +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] +tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={bts=[{'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'type': 'sysmo'}]}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] +tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] +tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 + addr: 10.42.42.53 + band: GSM-1800 + ipa_unit_id: '7' + label: sysmoCell 5000 + trx_list: + - max_power_red: '3' + nominal_power: '10' + - max_power_red: '0' + nominal_power: '12' + trx_remote_ip: 10.42.42.112 + type: osmo-bts-trx +- _hash: 9eaa928b04ce04b19dbae972f9bfc3eea6f5e249 + addr: 10.42.42.53 + band: GSM-1800 + ipa_unit_id: '7' + label: sysmoCell 5000 + trx_list: + - nominal_power: '10' + - max_power_red: '1' + nominal_power: '12' + trx_remote_ip: 10.42.42.112 + type: osmo-bts-trx +- _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9 + addr: 10.42.42.114 + band: GSM-1800 + ipa_unit_id: '1' + label: sysmoBTS 1002 + type: sysmo + [resource.py:[LINENR]] +tst test_suite: Reserving 1 x ip_address (candidates: 3) [resource.py:[LINENR]] +tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4 + addr: 10.42.42.1 + [resource.py:[LINENR]] +tst test_suite: Reserving 2 x modem (candidates: 16) [resource.py:[LINENR]] +tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f + imsi: '901700000007801' + ki: D620F48487B1B782DA55DF6717F08FF9 + label: m7801 + path: /wavecom_0 +- _hash: e1a46516a1fb493b2617ab14fc1693a9a45ec254 + imsi: '901700000007802' + ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3 + label: m7802 + path: /wavecom_1 + [resource.py:[LINENR]] +resources(test_suite)={'bts': [{'_hash': '076ff06a4b719e61779492d3fb99f42a6635bb72', + '_reserved_by': 'test_suite-26124-1534849893', + 'addr': '10.42.42.53', + 'band': 'GSM-1800', + 'ipa_unit_id': '7', + 'label': 'sysmoCell 5000', + 'trx_list': [{'max_power_red': '3', 'nominal_power': '20'}, + {'max_power_red': '0', 'nominal_power': '20'}], + 'trx_remote_ip': '10.42.42.112', + 'type': 'osmo-bts-trx'}, + {'_hash': '9eaa928b04ce04b19dbae972f9bfc3eea6f5e249', + '_reserved_by': 'test_suite-26124-1534849893', + 'addr': '10.42.42.53', + 'band': 'GSM-1800', + 'ipa_unit_id': '7', + 'label': 'sysmoCell 5000', + 'trx_list': [{'nominal_power': '20'}, + {'max_power_red': '1', 'nominal_power': '20'}], + 'trx_remote_ip': '10.42.42.112', + 'type': 'osmo-bts-trx'}, + {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9', + '_reserved_by': 'test_suite-26124-1534849893', + 'addr': '10.42.42.114', + 'band': 'GSM-1800', + 'ipa_unit_id': '1', + 'label': 'sysmoBTS 1002', + 'type': 'sysmo'}], + 'ip_address': [{'_hash': 'cde1debf28f07f94f92c761b4b7c6bf35785ced4', + '_reserved_by': 'test_suite-26124-1534849893', + 'addr': '10.42.42.1'}], + 'modem': [{'_hash': '19c69e45aa090fb511446bd00797690aa82ff52f', + '_reserved_by': 'test_suite-26124-1534849893', + 'imsi': '901700000007801', + 'ki': 'D620F48487B1B782DA55DF6717F08FF9', + 'label': 'm7801', + 'path': '/wavecom_0'}, + {'_hash': 'e1a46516a1fb493b2617ab14fc1693a9a45ec254', + '_reserved_by': 'test_suite-26124-1534849893', + 'imsi': '901700000007802', + 'ki': '47FDB2D55CE6A10A85ABDAD034A5B7B3', + 'label': 'm7802', + 'path': '/wavecom_1'}]} + +--------------------------------------------------------------------- +trial test_suite +--------------------------------------------------------------------- + +---------------------------------------------- +trial test_suite hello_world.py +---------------------------------------------- +tst hello_world.py:[LINENR]: hello world [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: I am 'test_suite' / 'hello_world.py:[LINENR]' [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: one [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: two [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: three [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR] Test passed (N.N sec) [test_suite?hello_world.py] [test.py:[LINENR]] +--------------------------------------------------------------------- +trial test_suite PASS +--------------------------------------------------------------------- +PASS: test_suite (pass: 1, skip: 5) + pass: hello_world.py (N.N sec) + skip: mo_mt_sms.py + skip: mo_sms.py + skip: test_error.py + skip: test_fail.py + skip: test_fail_raise.py - graceful exit. diff --git a/selftest/suite_test.py b/selftest/suite_test.py index a8b0f37..db19ccc 100755 --- a/selftest/suite_test.py +++ b/selftest/suite_test.py @@ -58,5 +58,16 @@ results = s.run_tests('hello_world.py') print(report.suite_to_text(s)) +print('- test with scenario and modifiers') +trial = log.Origin(log.C_TST, 'trial') +scenario = config.Scenario('foo', 'bar') +scenario['resources'] = { 'bts': [{ 'times': '2', 'type': 'osmo-bts-trx', 'trx_list': [{'nominal_power': '10'}, {'nominal_power': '12'}]}, {'type': 'sysmo'}] } +scenario['modifiers'] = { 'bts': [{ 'times': '2', 'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'type': 'sysmo'}] } +s = suite.SuiteRun(trial, 'test_suite', s_def, [scenario]) +s.reserve_resources() +print(repr(s.reserved_resources)) +results = s.run_tests('hello_world.py') +print(report.suite_to_text(s)) + print('\n- graceful exit.') # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index dca8090..5204b61 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -87,7 +87,8 @@ CONF_SCHEMA = util.dict_add( { 'defaults.timeout': schema.STR }, - dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()])) + dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()]), + dict([('modifiers.%s' % key, val) for key, val in WANT_SCHEMA.items()])) KNOWN_BTS_TYPES = { 'osmo-bts-sysmo': bts_sysmo.SysmoBts, @@ -113,7 +114,7 @@ self.all_resources = Resources(config.read(self.config_path, RESOURCES_SCHEMA)) self.all_resources.set_hashes() - def reserve(self, origin, want): + def reserve(self, origin, want, modifiers): ''' attempt to reserve the resources specified in the dict 'want' for 'origin'. Obtain a lock on the resources lock dir, verify that all @@ -125,7 +126,11 @@ 'origin' should be an Origin() instance. - 'want' is a dict matching RESOURCES_SCHEMA. + 'want' is a dict matching RESOURCES_SCHEMA, used to specify what to + reserve. + + 'modifiers' is a dict matching RESOURCES_SCHEMA, it is overlaid on top + of 'want'. If an entry has no attribute set, any of the resources may be reserved without further limitations. @@ -142,6 +147,7 @@ } ''' schema.validate(want, RESOURCES_SCHEMA) + schema.validate(modifiers, RESOURCES_SCHEMA) origin_id = origin.origin_id() @@ -156,7 +162,7 @@ config.write(rrfile_path, reserved) self.remember_to_free(to_be_reserved) - return ReservedResources(self, origin, to_be_reserved) + return ReservedResources(self, origin, to_be_reserved, modifiers) def free(self, origin, to_be_freed): log.ctx(origin) @@ -491,10 +497,12 @@ dependencies from so far unused (but reserved) resource. ''' - def __init__(self, resources_pool, origin, reserved): + def __init__(self, resources_pool, origin, reserved, modifiers): self.resources_pool = resources_pool self.origin = origin - self.reserved = reserved + self.reserved_original = reserved + self.reserved = copy.deepcopy(self.reserved_original) + config.overlay(self.reserved, modifiers) def __repr__(self): return 'resources(%s)=%s' % (self.origin.name(), pprint.pformat(self.reserved)) @@ -551,9 +559,9 @@ item.pop(USED_KEY, None) def free(self): - if self.reserved: - self.resources_pool.free(self.origin, self.reserved) - self.reserved = None + if self.reserved_original: + self.resources_pool.free(self.origin, self.reserved_original) + self.reserved_original = None def counts(self): counts = {} diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index c712a75..fa86f96 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -71,6 +71,7 @@ self.objects_to_clean_up = None self.test_import_modules_to_clean_up = [] self._resource_requirements = None + self._resource_modifiers = None self._config = None self._processes = None self._run_dir = None @@ -154,6 +155,11 @@ self._resource_requirements = self.combined('resources') return self._resource_requirements + def resource_modifiers(self): + if self._resource_modifiers is None: + self._resource_modifiers = self.combined('modifiers') + return self._resource_modifiers + def config(self): if self._config is None: self._config = self.combined('config') @@ -163,7 +169,7 @@ if self.reserved_resources: raise RuntimeError('Attempt to reserve resources twice for a SuiteRun') self.log('reserving resources in', self.resources_pool.state_dir, '...') - self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements()) + self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements(), self.resource_modifiers()) def run_tests(self, names=None): suite_libdir = os.path.join(self.definition.suite_dir, 'lib') -- To view, visit https://gerrit.osmocom.org/10562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d Gerrit-Change-Number: 10562 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 13:49:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 21 Aug 2018 13:49:38 +0000 Subject: Change in osmo-gsm-tester[master]: Replace suites dyn_ts_ipa* and voice using scenario modifiers Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10563 Change subject: Replace suites dyn_ts_ipa* and voice using scenario modifiers ...................................................................... Replace suites dyn_ts_ipa* and voice using scenario modifiers Now that we support modifiers in scenario files, we don't need to duplicate tests and testsuites to dynamically set trx configuration at run time. It can be done more easily with scenario modifiers. Change-Id: I80c441bb5b98d5d2e95d4c6ae1efab3e5f3c40d9 --- M example/default-suites.conf A example/scenarios/mod-bts0-dynts-ipa.conf A example/scenarios/mod-bts0-dynts-osmo.conf A example/scenarios/mod-bts0-ts-tchf.conf A example/scenarios/mod-bts0-ts-tchh.conf D suites/dyn_ts_ipa/lib/testlib.py D suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py D suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py D suites/dyn_ts_ipa/suite.conf D suites/dyn_ts_osmo/lib/testlib.py D suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py D suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py D suites/dyn_ts_osmo/suite.conf D suites/voice/lib/testlib.py A suites/voice/mo_mt_call.py D suites/voice/mo_mt_call_tchf.py D suites/voice/mo_mt_call_tchh.py 17 files changed, 136 insertions(+), 278 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/63/10563/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index fa95daa..7ff8470 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -2,45 +2,59 @@ - aoip_sms:sysmo - ussd:sysmo - aoip_ussd:sysmo -- voice:sysmo -- dyn_ts_ipa:sysmo -- dyn_ts_osmo:sysmo +- voice:sysmo+mod-bts0-ts-tchf +- voice:sysmo+mod-bts0-ts-tchh +- voice:sysmo+mod-bts0-dynts-ipa +- voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo +- gprs:sysmo+mod-bts0-dynts-ipa +- gprs:sysmo+mod-bts0-dynts-osmo - sms:trx-b200 - aoip_sms:trx-b200 - ussd:trx-b200 - aoip_ussd:trx-b200 -- voice:trx-b200 -- dyn_ts_ipa:trx-b200 -- dyn_ts_osmo:trx-b200 +- voice:trx-b200+mod-bts0-ts-tchf +- voice:trx-b200+mod-bts0-ts-tchh +- voice:trx-b200+mod-bts0-dynts-ipa +- voice:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200 +- gprs:trx-b200+mod-bts0-dynts-ipa +- gprs:trx-b200+mod-bts0-dynts-osmo - sms:trx-sysmocell5000 - aoip_sms:trx-sysmocell5000 - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 -- voice:trx-sysmocell5000 -- dyn_ts_ipa:trx-sysmocell5000 -- dyn_ts_osmo:trx-sysmocell5000 +- voice:trx-sysmocell5000+mod-bts0-ts-tchf +- voice:trx-sysmocell5000+mod-bts0-ts-tchh +- voice:trx-sysmocell5000+mod-bts0-dynts-ipa +- voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 +- gprs:trx-sysmocell5000+mod-bts0-dynts-ipa +- gprs:trx-sysmocell5000+mod-bts0-dynts-osmo - sms:octphy - aoip_sms:octphy - ussd:octphy - aoip_ussd:octphy -- voice:octphy +- voice:octphy+mod-bts0-ts-tchf +- voice:octphy+mod-bts0-ts-tchh - gprs:octphy - sms:nanobts - aoip_sms:nanobts+band-1900 - ussd:nanobts+band-1900 - aoip_ussd:nanobts+band-1900 -- voice:nanobts+band-1900 -- dyn_ts_ipa:nanobts+band-1900 +- voice:nanobts+band-1900+mod-bts0-ts-tchf +- voice:nanobts+band-1900+mod-bts0-ts-tchh +- voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 +- gprs:nanobts+band-1900+mod-bts0-dynts-ipa - aoip_sms:nanobts+band-900 - ussd:nanobts+band-900 - aoip_ussd:nanobts+band-900 -- voice:nanobts+band-900 -- dyn_ts_ipa:nanobts+band-900 +- voice:nanobts+band-900+mod-bts0-ts-tchf +- voice:nanobts+band-900+mod-bts0-ts-tchh +- voice:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900 +- gprs:nanobts+band-900+mod-bts0-dynts-ipa - smpp - aoip_smpp - aoip_encryption diff --git a/example/scenarios/mod-bts0-dynts-ipa.conf b/example/scenarios/mod-bts0-dynts-ipa.conf new file mode 100644 index 0000000..fcad2c7 --- /dev/null +++ b/example/scenarios/mod-bts0-dynts-ipa.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' diff --git a/example/scenarios/mod-bts0-dynts-osmo.conf b/example/scenarios/mod-bts0-dynts-osmo.conf new file mode 100644 index 0000000..26345bd --- /dev/null +++ b/example/scenarios/mod-bts0-dynts-osmo.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' diff --git a/example/scenarios/mod-bts0-ts-tchf.conf b/example/scenarios/mod-bts0-ts-tchf.conf new file mode 100644 index 0000000..527b620 --- /dev/null +++ b/example/scenarios/mod-bts0-ts-tchf.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' diff --git a/example/scenarios/mod-bts0-ts-tchh.conf b/example/scenarios/mod-bts0-ts-tchh.conf new file mode 100644 index 0000000..0709bc4 --- /dev/null +++ b/example/scenarios/mod-bts0-ts-tchh.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' diff --git a/suites/dyn_ts_ipa/lib/testlib.py b/suites/dyn_ts_ipa/lib/testlib.py deleted file mode 100755 index 28a4975..0000000 --- a/suites/dyn_ts_ipa/lib/testlib.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -def call_test_setup_run(bts_setup_cb=None, gprs_enable=True): - hlr = suite.hlr() - bts = suite.bts() - mgw_msc = suite.mgw() - mgw_bsc = suite.mgw() - stp = suite.stp() - msc = suite.msc(hlr, mgw_msc, stp) - bsc = suite.bsc(msc, mgw_bsc, stp) - ms_mo = suite.modem() - ms_mt = suite.modem() - - if bts_setup_cb is not None: - bts_setup_cb(bts) - - if gprs_enable: - ggsn = suite.ggsn() - sgsn = suite.sgsn(hlr, ggsn) - sgsn.bts_add(bts) - ggsn.start() - sgsn.start() - - hlr.start() - stp.start() - msc.start() - mgw_msc.start() - mgw_bsc.start() - - bsc.bts_add(bts) - bsc.start() - - bts.start() - wait(bsc.bts_is_connected, bts) - - hlr.subscriber_add(ms_mo) - hlr.subscriber_add(ms_mt) - - ms_mo.connect(msc.mcc_mnc()) - ms_mt.connect(msc.mcc_mnc()) - - ms_mo.log_info() - ms_mt.log_info() - - print('waiting for modems to attach...') - wait(ms_mo.is_connected, msc.mcc_mnc()) - wait(ms_mt.is_connected, msc.mcc_mnc()) - wait(msc.subscriber_attached, ms_mo, ms_mt) - - assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 - mo_cid = ms_mo.call_dial(ms_mt) - mt_cid = ms_mt.call_wait_incoming(ms_mo) - print('dial success') - - assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) - ms_mt.call_answer(mt_cid) - wait(ms_mo.call_is_active, mo_cid) - wait(ms_mt.call_is_active, mt_cid) - print('answer success, call established and ongoing') - - sleep(5) # maintain the call active for 5 seconds - - assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) - ms_mt.call_hangup(mt_cid) - wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) - print('hangup success') diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py deleted file mode 100755 index 4fe4e46..0000000 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 7, 'PDCH') - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py deleted file mode 100755 index c1349ae..0000000 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 7, 'TCH/F_PDCH') - -# Check that dynamic timeslots work fine with gprs disabled. - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) diff --git a/suites/dyn_ts_ipa/suite.conf b/suites/dyn_ts_ipa/suite.conf deleted file mode 100644 index 4ac2436..0000000 --- a/suites/dyn_ts_ipa/suite.conf +++ /dev/null @@ -1,9 +0,0 @@ -resources: - ip_address: - - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn - bts: - - times: 1 - modem: - - times: 2 - features: - - voice diff --git a/suites/dyn_ts_osmo/lib/testlib.py b/suites/dyn_ts_osmo/lib/testlib.py deleted file mode 120000 index 8f0bc5a..0000000 --- a/suites/dyn_ts_osmo/lib/testlib.py +++ /dev/null @@ -1 +0,0 @@ -../../dyn_ts_ipa/lib/testlib.py \ No newline at end of file diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py deleted file mode 100755 index b9b7935..0000000 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 7, 'PDCH') - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py deleted file mode 100755 index d80d27a..0000000 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 7, 'TCH/F_TCH/H_PDCH') - -# Check that dynamic timeslots work fine with gprs disabled. - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) diff --git a/suites/dyn_ts_osmo/suite.conf b/suites/dyn_ts_osmo/suite.conf deleted file mode 100644 index 4ac2436..0000000 --- a/suites/dyn_ts_osmo/suite.conf +++ /dev/null @@ -1,9 +0,0 @@ -resources: - ip_address: - - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn - bts: - - times: 1 - modem: - - times: 2 - features: - - voice diff --git a/suites/voice/lib/testlib.py b/suites/voice/lib/testlib.py deleted file mode 100755 index f949809..0000000 --- a/suites/voice/lib/testlib.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -def call_test_setup_run(bts_setup_cb=None): - hlr = suite.hlr() - bts = suite.bts() - mgw_msc = suite.mgw() - mgw_bsc = suite.mgw() - stp = suite.stp() - msc = suite.msc(hlr, mgw_msc, stp) - bsc = suite.bsc(msc, mgw_bsc, stp) - ms_mo = suite.modem() - ms_mt = suite.modem() - - if bts_setup_cb is not None: - bts_setup_cb(bts) - - hlr.start() - stp.start() - msc.start() - mgw_msc.start() - mgw_bsc.start() - - bsc.bts_add(bts) - bsc.start() - - bts.start() - wait(bsc.bts_is_connected, bts) - - hlr.subscriber_add(ms_mo) - hlr.subscriber_add(ms_mt) - - ms_mo.connect(msc.mcc_mnc()) - ms_mt.connect(msc.mcc_mnc()) - - ms_mo.log_info() - ms_mt.log_info() - - print('waiting for modems to attach...') - wait(ms_mo.is_connected, msc.mcc_mnc()) - wait(ms_mt.is_connected, msc.mcc_mnc()) - wait(msc.subscriber_attached, ms_mo, ms_mt) - - assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 - mo_cid = ms_mo.call_dial(ms_mt) - mt_cid = ms_mt.call_wait_incoming(ms_mo) - print('dial success') - - assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) - ms_mt.call_answer(mt_cid) - wait(ms_mo.call_is_active, mo_cid) - wait(ms_mt.call_is_active, mt_cid) - print('answer success, call established and ongoing') - - sleep(5) # maintain the call active for 5 seconds - - assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) - ms_mt.call_hangup(mt_cid) - wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) - print('hangup success') diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py new file mode 100755 index 0000000..aeda80d --- /dev/null +++ b/suites/voice/mo_mt_call.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +hlr = suite.hlr() +bts = suite.bts() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms_mo = suite.modem() +ms_mt = suite.modem() + +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() + +bsc.bts_add(bts) +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) + +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) + +ms_mo.connect(msc.mcc_mnc()) +ms_mt.connect(msc.mcc_mnc()) + +ms_mo.log_info() +ms_mt.log_info() + +print('waiting for modems to attach...') +wait(ms_mo.is_connected, msc.mcc_mnc()) +wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms_mo, ms_mt) + +assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 +mo_cid = ms_mo.call_dial(ms_mt) +mt_cid = ms_mt.call_wait_incoming(ms_mo) +print('dial success') + +assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) +ms_mt.call_answer(mt_cid) +wait(ms_mo.call_is_active, mo_cid) +wait(ms_mt.call_is_active, mt_cid) +print('answer success, call established and ongoing') + +sleep(5) # maintain the call active for 5 seconds + +assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) +ms_mt.call_hangup(mt_cid) +wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) +print('hangup success') diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py deleted file mode 100755 index af55dfd..0000000 --- a/suites/voice/mo_mt_call_tchf.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F') - bts.set_trx_phy_channel(0, 3, 'TCH/F') - bts.set_trx_phy_channel(0, 4, 'TCH/F') - bts.set_trx_phy_channel(0, 5, 'TCH/F') - bts.set_trx_phy_channel(0, 6, 'TCH/F') - bts.set_trx_phy_channel(0, 7, 'TCH/F') - -call_test_setup_run(bts_setup_cb=my_bts_setup) diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py deleted file mode 100755 index 43d0760..0000000 --- a/suites/voice/mo_mt_call_tchh.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/H') - bts.set_trx_phy_channel(0, 3, 'TCH/H') - bts.set_trx_phy_channel(0, 4, 'TCH/H') - bts.set_trx_phy_channel(0, 5, 'TCH/H') - bts.set_trx_phy_channel(0, 6, 'TCH/H') - bts.set_trx_phy_channel(0, 7, 'TCH/H') - -call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/10563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I80c441bb5b98d5d2e95d4c6ae1efab3e5f3c40d9 Gerrit-Change-Number: 10563 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 14:48:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 21 Aug 2018 14:48:15 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce scenario modifiers In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10562 to look at the new patch set (#2). Change subject: Introduce scenario modifiers ...................................................................... Introduce scenario modifiers Before this patch, scenarios were only used to select resources with specific attributes. This commit introduces "modifiers" in scenarios, which allows setting or modifing config attributes of resources once they have been reserved. This way same test can be run selecting same resources but modifying its configuration, allowing for instance running different number of TRX, different timeslot configuration, etc. Modifiers are described by placing a "modifiers" dictionary in any scenario file, similar to the current "resources" one used to select requird resources. The "modifiers" dictionary is overlaid on top of the "resources" one resulting from combining all the "resources" dictionary of all scenario files. Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d --- A example/scenarios/mod-bts0-numtrx2.conf M selftest/resource_test.ok M selftest/resource_test.py M selftest/suite_test.ok M selftest/suite_test.ok.ign M selftest/suite_test.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/suite.py 8 files changed, 226 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/62/10562/2 -- To view, visit https://gerrit.osmocom.org/10562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d Gerrit-Change-Number: 10562 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 21 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 21 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#222?= In-Reply-To: <1201926074.43.1534777806889.JavaMail.jenkins@jenkins.osmocom.org> References: <1201926074.43.1534777806889.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1184480258.64.1534864206966.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Aug 21 15:27:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 21 Aug 2018 15:27:26 +0000 Subject: Change in osmo-bts[master]: measurement: fix measurement interval end detection Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10564 Change subject: measurement: fix measurement interval end detection ...................................................................... measurement: fix measurement interval end detection for SDDCH4 channels, the detection is not working correctly since the function uses the lookup table for SDCCH8 interval endings there. This needs to be corrected. Also there are two unnecessary assignments in the code which should be removed. - use correct table (sdcch4_meas_rep_fn102 instead of sdcch8_meas_rep_fn102. - remove unnecessary assignments to last_fn_mod Change-Id: If8a269ecd3f9fa4eeadf379114db816ef5c77d77 Related: OS#2975 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/10564/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 41844b1..cb45e6e 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -328,7 +328,6 @@ break; case GSM_PCHAN_TCH_H: modulus = 104; - last_fn_mod = lchan->meas.last_fn % 104; if (lchan->nr == 0) tbl = tchh0_meas_rep_fn104; else @@ -339,13 +338,12 @@ case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: modulus = 102; - last_fn_mod = lchan->meas.last_fn % 102; interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: modulus = 102; - interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; + interval_end = sdcch4_meas_rep_fn102[lchan->ts->nr]; break; default: return false; -- To view, visit https://gerrit.osmocom.org/10564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If8a269ecd3f9fa4eeadf379114db816ef5c77d77 Gerrit-Change-Number: 10564 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 16:33:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 21 Aug 2018 16:33:09 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc, msc: Set mgw local-ip in cfg.tmpl Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10565 Change subject: osmo-bsc,msc: Set mgw local-ip in cfg.tmpl ...................................................................... osmo-bsc,msc: Set mgw local-ip in cfg.tmpl Change-Id: Id46aa337f12756f80d492bf3102db5b1449e2027 --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/65/10565/1 diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 30774cf..18303b6 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -108,6 +108,7 @@ ip.access rtp-base 25000 mgw remote-ip ${mgw.ip_address.addr} mgw remote-port 2427 + mgw local-ip ${bsc.ip_address.addr} mgw endpoint-range 1 31 codec-list hr3 amr-config 12_2k forbidden diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 76f1001..485a88b 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -24,6 +24,8 @@ routing-key 1 0.0.1 msc mgw remote-ip ${mgw.ip_address.addr} + mgw remote-port 2427 + mgw local-ip ${msc.ip_address.addr} mgw endpoint-range 1 31 mgw bts-base 8000 assign-tmsi -- To view, visit https://gerrit.osmocom.org/10565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id46aa337f12756f80d492bf3102db5b1449e2027 Gerrit-Change-Number: 10565 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 21 18:07:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 21 Aug 2018 18:07:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#2579?= Message-ID: <860930794.65.1534874845680.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 851.19 KB...] State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4244 *:* LISTEN 0 10 127.0.0.1:4250 *:* LISTEN 0 1 127.0.0.1:5000 *:* LISTEN 0 1 *:5001 *:* > ps xua | grep osmo build 5051 0.0 0.0 48148 5376 ? S 18:07 0:00 ./src/osmo-bsc_nat/osmo-bsc_nat -l 127.0.0.1 -c /build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg build 5058 0.0 0.0 4336 772 ? S 18:07 0:00 /bin/sh -c ps xua | grep osmo build 5060 0.0 0.0 11128 936 ? S 18:07 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4244 (1 sockets open) MSC is ready at 127.0.0.1 'show msc connection' says: 'MSC is connected: 1' ERROR Socket: closing 127.0.0.1:4244 (0 sockets open) testEnsureNoEnsureModeSet (__main__.TestVTYNAT) ... Launching: PWD=/build/openbsc './src/osmo-bsc_nat/osmo-bsc_nat' '-l' '127.0.0.1' '-c' '/build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg' > ls -l /proc/4790/fd total 0 lr-x------ 1 build build 64 Aug 21 18:06 0 -> pipe:[1260475566] l-wx------ 1 build build 64 Aug 21 18:06 1 -> pipe:[1260475567] l-wx------ 1 build build 64 Aug 21 18:06 2 -> pipe:[1260475568] l-wx------ 1 build build 64 Aug 21 18:06 3 -> /dev/null lr-x------ 1 build build 64 Aug 21 18:06 5 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4244 *:* LISTEN 0 10 127.0.0.1:4250 *:* LISTEN 0 1 127.0.0.1:5000 *:* LISTEN 0 1 *:5001 *:* > ps xua | grep osmo build 5061 0.0 0.0 48148 5360 ? S 18:07 0:00 ./src/osmo-bsc_nat/osmo-bsc_nat -l 127.0.0.1 -c /build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg build 5068 0.0 0.0 4336 764 ? S 18:07 0:00 /bin/sh -c ps xua | grep osmo build 5070 0.0 0.0 11128 960 ? S 18:07 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4244 (1 sockets open) Socket: closing 127.0.0.1:4244 (0 sockets open) ok testPrefixTreeLoading (__main__.TestVTYNAT) ... Launching: PWD=/build/openbsc './src/osmo-bsc_nat/osmo-bsc_nat' '-l' '127.0.0.1' '-c' '/build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg' > ls -l /proc/4790/fd total 0 lr-x------ 1 build build 64 Aug 21 18:06 0 -> pipe:[1260475566] l-wx------ 1 build build 64 Aug 21 18:06 1 -> pipe:[1260475567] l-wx------ 1 build build 64 Aug 21 18:06 2 -> pipe:[1260475568] l-wx------ 1 build build 64 Aug 21 18:06 3 -> /dev/null lr-x------ 1 build build 64 Aug 21 18:06 5 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4244 *:* LISTEN 0 10 127.0.0.1:4250 *:* LISTEN 0 1 127.0.0.1:5000 *:* LISTEN 0 1 *:5001 *:* > ps xua | grep osmo build 5071 0.0 0.0 48148 5360 ? S 18:07 0:00 ./src/osmo-bsc_nat/osmo-bsc_nat -l 127.0.0.1 -c /build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg build 5078 0.0 0.0 4336 720 ? S 18:07 0:00 /bin/sh -c ps xua | grep osmo build 5080 0.0 0.0 11128 1000 ? S 18:07 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4244 (1 sockets open) Socket: closing 127.0.0.1:4244 (0 sockets open) ok testRewriteNoRewrite (__main__.TestVTYNAT) ... Launching: PWD=/build/openbsc './src/osmo-bsc_nat/osmo-bsc_nat' '-l' '127.0.0.1' '-c' '/build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg' > ls -l /proc/4790/fd total 0 lr-x------ 1 build build 64 Aug 21 18:06 0 -> pipe:[1260475566] l-wx------ 1 build build 64 Aug 21 18:06 1 -> pipe:[1260475567] l-wx------ 1 build build 64 Aug 21 18:06 2 -> pipe:[1260475568] l-wx------ 1 build build 64 Aug 21 18:06 3 -> /dev/null lr-x------ 1 build build 64 Aug 21 18:06 5 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4244 *:* LISTEN 0 10 127.0.0.1:4250 *:* LISTEN 0 1 127.0.0.1:5000 *:* LISTEN 0 1 *:5001 *:* > ps xua | grep osmo build 5081 0.0 0.0 48148 5484 ? S 18:07 0:00 ./src/osmo-bsc_nat/osmo-bsc_nat -l 127.0.0.1 -c /build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg build 5088 0.0 0.0 4336 764 ? S 18:07 0:00 /bin/sh -c ps xua | grep osmo build 5090 0.0 0.0 4336 108 ? R 18:07 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4244 (1 sockets open) Socket: closing 127.0.0.1:4244 (0 sockets open) ok testRewritePostNoRewrite (__main__.TestVTYNAT) ... Launching: PWD=/build/openbsc './src/osmo-bsc_nat/osmo-bsc_nat' '-l' '127.0.0.1' '-c' '/build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg' > ls -l /proc/4790/fd total 0 lr-x------ 1 build build 64 Aug 21 18:06 0 -> pipe:[1260475566] l-wx------ 1 build build 64 Aug 21 18:06 1 -> pipe:[1260475567] l-wx------ 1 build build 64 Aug 21 18:06 2 -> pipe:[1260475568] l-wx------ 1 build build 64 Aug 21 18:06 3 -> /dev/null lr-x------ 1 build build 64 Aug 21 18:06 5 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4244 *:* LISTEN 0 10 127.0.0.1:4250 *:* LISTEN 0 1 127.0.0.1:5000 *:* LISTEN 0 1 *:5001 *:* > ps xua | grep osmo build 5091 0.0 0.0 48148 5320 ? S 18:07 0:00 ./src/osmo-bsc_nat/osmo-bsc_nat -l 127.0.0.1 -c /build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg build 5098 0.0 0.0 4336 768 ? S 18:07 0:00 /bin/sh -c ps xua | grep osmo build 5100 0.0 0.0 11128 948 ? S 18:07 0:00 grep osmo Socket: in 1 tries, connected to 127.0.0.1:4244 (1 sockets open) Socket: closing 127.0.0.1:4244 (0 sockets open) ok testUssdSideChannelProvider (__main__.TestVTYNAT) ... Launching: PWD=/build/openbsc './src/osmo-bsc_nat/osmo-bsc_nat' '-l' '127.0.0.1' '-c' '/build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg' > ls -l /proc/4790/fd total 0 lr-x------ 1 build build 64 Aug 21 18:06 0 -> pipe:[1260475566] l-wx------ 1 build build 64 Aug 21 18:06 1 -> pipe:[1260475567] l-wx------ 1 build build 64 Aug 21 18:06 2 -> pipe:[1260475568] l-wx------ 1 build build 64 Aug 21 18:06 3 -> /dev/null lr-x------ 1 build build 64 Aug 21 18:06 5 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4244 *:* LISTEN 0 10 127.0.0.1:4250 *:* LISTEN 0 1 127.0.0.1:5000 *:* LISTEN 0 1 *:5001 *:* > ps xua | grep osmo build 5101 0.0 0.0 48148 5520 ? S 18:07 0:00 ./src/osmo-bsc_nat/osmo-bsc_nat -l 127.0.0.1 -c /build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg build 5108 0.0 0.0 4336 816 ? S 18:07 0:00 /bin/sh -c ps xua | grep osmo build 5110 0.0 0.0 4336 104 ? R 18:07 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4244 (1 sockets open) Connected to 127.0.0.1:5001 Expecting ID_GET request Going to send ID_RESP response Going to send PING request Expecting PONG response Going to shut down connection Expecting EOF Socket: closing 127.0.0.1:4244 (0 sockets open) ok testVtyTree (__main__.TestVTYNAT) ... Launching: PWD=/build/openbsc './src/osmo-bsc_nat/osmo-bsc_nat' '-l' '127.0.0.1' '-c' '/build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg' > ls -l /proc/4790/fd total 0 lr-x------ 1 build build 64 Aug 21 18:06 0 -> pipe:[1260475566] l-wx------ 1 build build 64 Aug 21 18:06 1 -> pipe:[1260475567] l-wx------ 1 build build 64 Aug 21 18:06 2 -> pipe:[1260475568] l-wx------ 1 build build 64 Aug 21 18:06 3 -> /dev/null lr-x------ 1 build build 64 Aug 21 18:06 5 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4244 *:* LISTEN 0 10 127.0.0.1:4250 *:* LISTEN 0 1 127.0.0.1:5000 *:* LISTEN 0 1 *:5001 *:* > ps xua | grep osmo build 5111 0.0 0.0 48148 5488 ? S 18:07 0:00 ./src/osmo-bsc_nat/osmo-bsc_nat -l 127.0.0.1 -c /build/openbsc/tests/../doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg build 5118 0.0 0.0 4336 756 ? S 18:07 0:00 /bin/sh -c ps xua | grep osmo build 5120 0.0 0.0 4336 104 ? R 18:07 0:00 /bin/sh -c ps xua | grep osmo Socket: in 1 tries, connected to 127.0.0.1:4244 (1 sockets open) Socket: closing 127.0.0.1:4244 (0 sockets open) ok ====================================================================== ERROR: testBSCreload (__main__.TestVTYNAT) ---------------------------------------------------------------------- Traceback (most recent call last): File "./vty_test_runner.py", line 801, in testBSCreload msc_socket, msc = nat_msc_test(self, ip, port, verbose=True) File "./vty_test_runner.py", line 1046, in nat_msc_test " connected yet: %r %r" % (ip, port)) Exception: VTY reports MSC is connected, but I haven't connected yet: '127.0.0.1' 5522 ---------------------------------------------------------------------- Ran 33 tests in 77.507s FAILED (errors=1) Makefile:713: recipe for target 'python-tests' failed make[5]: Leaving directory '/build/openbsc/tests' make[5]: *** [python-tests] Error 1 Makefile:723: recipe for target 'check-local' failed make[4]: Leaving directory '/build/openbsc/tests' make[4]: *** [check-local] Error 2 make[3]: *** [check-am] Error 2 Makefile:575: recipe for target 'check-am' failed make[3]: Leaving directory '/build/openbsc/tests' Makefile:427: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/openbsc/tests' make[2]: *** [check-recursive] Error 1 Makefile:509: recipe for target 'check-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [check-recursive] Error 1 Makefile:800: recipe for target 'check' failed make: *** [check] Error 2 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Aug 21 19:24:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 21 Aug 2018 19:24:55 +0000 Subject: Change in osmo-mgw[master]: interpret domain '*' as 'allow any domain' In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10557 ) Change subject: interpret domain '*' as 'allow any domain' ...................................................................... Patch Set 1: Code-Review+2 We looked at this together and laforge agreed to merge in person. -- To view, visit https://gerrit.osmocom.org/10557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0220c88d2f5cee15f2a90390b3c4590ac61d5eb Gerrit-Change-Number: 10557 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 21 Aug 2018 19:24:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 21 19:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 21 Aug 2018 19:24:58 +0000 Subject: Change in osmo-mgw[master]: interpret domain '*' as 'allow any domain' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10557 ) Change subject: interpret domain '*' as 'allow any domain' ...................................................................... interpret domain '*' as 'allow any domain' Make the 'domain NAME' vty doc more descriptive, and add the hint that '*' means any domain. In check_domain_name(), exit early in success if the configured domain name is '*'. (Do not implement other wildcard functionality for partial matches or the like, just the single '*'.) Related: OS#3490 Change-Id: Ie0220c88d2f5cee15f2a90390b3c4590ac61d5eb --- M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_vty.c 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 7378ddc..a89c579 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -219,6 +219,10 @@ if (!domain_to_check) return -EINVAL; + /* Accept any domain if configured as "*" */ + if (!strcmp(cfg->domain, "*")) + return 0; + if (strcmp(domain_to_check+1, cfg->domain) != 0) return -EINVAL; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index ad462b7..00af3bd 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -1208,7 +1208,9 @@ DEFUN(cfg_mgcp_domain, cfg_mgcp_domain_cmd, - "domain NAME", "domain\n" "qualified domain name\n") + "domain NAME", + "Set the domain part expected in MGCP messages' endpoint names\n" + "Qualified domain name expected in MGCP endpoint names, or '*' to accept any domain\n") { osmo_strlcpy(g_cfg->domain, argv[0], sizeof(g_cfg->domain)); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/10557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie0220c88d2f5cee15f2a90390b3c4590ac61d5eb Gerrit-Change-Number: 10557 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 22 00:02:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 22 Aug 2018 00:02:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_tr?= =?UTF-8?Q?x,master,default,osmocom-master-debian9_#1051?= Message-ID: <848515367.66.1534896129751.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 64.13 KB...] Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC rxlev_stat.lo CC a5.lo CC comp128.lo CC tlv_parser.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo CC gsm48.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC milenage/aes-encblock.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_mapping.lo CC gsm0503_interleaving.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_bssgp_util.lo CC gprs_bssgp_vty.lo CC gprs_ns_vty.lo CC gprs_bssgp.lo CC common_vty.lo CC gprs_bssgp_bss.lo CCLD libosmogb.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la ' libtool: warning: relinking 'libosmogb.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) libtool: install: /usr/bin/install -c .libs/libosmogb.so.6.1.0T libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so.6 || { rm -f libosmogb.so.6 && ln -s libosmogb.so.6.1.0 libosmogb.so.6; }; }) libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so || { rm -f libosmogb.so && ln -s libosmogb.so.6.1.0 libosmogb.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogb.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/ctrl make[2]: Entering directory ' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_vty.lo CC control_if.lo CCLD libosmoctrl.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmoctrl.la ' libtool: warning: relinking 'libosmoctrl.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -I../../include -I../../include -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmoctrl.map -version-info 3:0:3 -no-undefined -o libosmoctrl.la -rpath control_cmd.lo control_if.lo fsm_ctrl_commands.lo control_vty.lo -ltalloc ../../src/libosmocore.la ../../src/gsm/libosmogsm.la ../../src/vty/libosmovty.la ) libtool: install: /usr/bin/install -c .libs/libosmoctrl.so.0.3.0T libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so.0 || { rm -f libosmoctrl.so.0 && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so.0; }; }) libtool: install: (cd && { ln -s -f libosmoctrl.so.0.3.0 libosmoctrl.so || { rm -f libosmoctrl.so && ln -s libosmoctrl.so.0.3.0 libosmoctrl.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmoctrl.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/sim make[2]: Entering directory ' CC core.lo CC reader.lo CC reader_pcsc.lo CC card_fs_isim.lo CC card_fs_sim.lo CC class_tables.lo CC card_fs_usim.lo CC card_fs_uicc.lo /bin/bash: line 2: 22747 Illegal instruction /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -fPIC -Wall -I/usr/include/PCSC -pthread -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT card_fs_uicc.lo -MD -MP -MF $depbase.Tpo -c -o card_fs_uicc.lo card_fs_uicc.c Makefile:490: recipe for target 'card_fs_uicc.lo' failed make[2]: *** [card_fs_uicc.lo] Error 132 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:604: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 22 00:03:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 22 Aug 2018 00:03:36 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#2580?= In-Reply-To: <860930794.65.1534874845680.JavaMail.jenkins@jenkins.osmocom.org> References: <860930794.65.1534874845680.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <775811436.67.1534896216348.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Aug 22 00:16:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 22 Aug 2018 00:16:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_origin/n?= =?UTF-8?Q?rw/litecell15,osmocom-master-debian9,lc15,True_#747?= Message-ID: <447473737.68.1534896975353.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 91.38 KB...] make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c osmo-release.sh ' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc ' /usr/bin/install -c -m 644 osmo-release.mk ' make install-data-hook make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmocore + export PKG_CONFIG_PATH=: + export LD_LIBRARY_PATH= + set +x =============================== osmo-pcu =============================== + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, libtoolize: and rerunning libtoolize and aclocal. libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:21: installing './compile' configure.ac:24: installing './config.guess' configure.ac:24: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/Makefile.am: installing './depcomp' tests/Makefile.am:13: warning: source file 'alloc/AllocTest.cpp' is in a subdirectory, tests/Makefile.am:13: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. tests/Makefile.am:21: warning: source file 'alloc/MslotTest.cpp' is in a subdirectory, tests/Makefile.am:21: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file 'bitcomp/BitcompTest.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file '../src/egprs_rlc_compression.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:97: warning: source file 'codel/codel_test.c' is in a subdirectory, tests/Makefile.am:97: but option 'subdir-objects' is disabled tests/Makefile.am:44: warning: source file 'edge/EdgeTest.cpp' is in a subdirectory, tests/Makefile.am:44: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/pcu_emu.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_replay_gprs_attach.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/openbsc_clone.c' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_pdp_activation.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:103: warning: source file 'fn/FnTest.cpp' is in a subdirectory, tests/Makefile.am:103: but option 'subdir-objects' is disabled tests/Makefile.am:81: warning: source file 'llc/LlcTest.cpp' is in a subdirectory, tests/Makefile.am:81: but option 'subdir-objects' is disabled tests/Makefile.am:92: warning: source file 'llist/LListTest.cpp' is in a subdirectory, tests/Makefile.am:92: but option 'subdir-objects' is disabled tests/Makefile.am:70: warning: source file 'ms/MsTest.cpp' is in a subdirectory, tests/Makefile.am:70: but option 'subdir-objects' is disabled tests/Makefile.am:7: warning: source file 'rlcmac/RLCMACTest.cpp' is in a subdirectory, tests/Makefile.am:7: but option 'subdir-objects' is disabled tests/Makefile.am:29: warning: source file 'tbf/TbfTest.cpp' is in a subdirectory, tests/Makefile.am:29: but option 'subdir-objects' is disabled tests/Makefile.am:62: warning: source file 'types/TypesTest.cpp' is in a subdirectory, tests/Makefile.am:62: but option 'subdir-objects' is disabled + ./configure --enable-lc15bts-phy --with-litecell15= --enable-vty-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking whether to enable direct DSP access for PDCH of sysmocom-bts... unset checking whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY tests... yes CFLAGS="-g -O2" CPPFLAGS="" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-pcu.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 Making all in include make[1]: Entering directory ' make[1]: Nothing to be done for 'all'. make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' CXX gprs_debug.lo CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_ts_alloc.lo gprs_bssgp_pcu.cpp:982:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo CXX bts.lo CXX pdch.lo /bin/bash: line 2: 21834 Illegal instruction /bin/bash ../libtool --silent --tag=CXX --mode=compile g++ -DPACKAGE_NAME=\"osmo-pcu\" -DPACKAGE_TARNAME=\"osmo-pcu\" -DPACKAGE_VERSION=\"0.5.1.1-54af\" -DPACKAGE_STRING=\"osmo-pcu\ 0.5.1.1-54af\" -DPACKAGE_BUGREPORT=\"osmocom-net-gprs at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"osmo-pcu\" -DVERSION=\"0.5.1.1-54af\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DSTDC_HEADERS=1 -I. -I../include -Wall -I -I -fno-strict-aliasing -I -DENABLE_DIRECT_PHY -I -I./osmo-bts-litecell15 -Wall -ldl -pthread -g -O2 -MT bts.lo -MD -MP -MF $depbase.Tpo -c -o bts.lo bts.cpp Makefile:777: recipe for target 'bts.lo' failed make[1]: *** [bts.lo] Error 132 make[1]: *** Waiting for unfinished jobs.... make[1]: Leaving directory ' Makefile:461: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 22 00:49:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 22 Aug 2018 00:49:31 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts?= =?UTF-8?Q?_=C2=BB_trx,master,default,osmocom-master-debian9_#1052?= In-Reply-To: <848515367.66.1534896129751.JavaMail.jenkins@jenkins.osmocom.org> References: <848515367.66.1534896129751.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <313670139.69.1534898971172.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Aug 22 07:38:32 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 22 Aug 2018 07:38:32 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu_=C2=BB_ori?= =?UTF-8?Q?gin/nrw/litecell15,osmocom-master-debian9,lc15,True_#748?= In-Reply-To: <447473737.68.1534896975353.JavaMail.jenkins@jenkins.osmocom.org> References: <447473737.68.1534896975353.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <301773288.76.1534923512999.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Aug 22 10:17:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 22 Aug 2018 10:17:32 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce scenario modifiers In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10562 ) Change subject: Introduce scenario modifiers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d Gerrit-Change-Number: 10562 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 22 Aug 2018 10:17:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 10:22:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 22 Aug 2018 10:22:20 +0000 Subject: Change in osmo-gsm-tester[master]: Replace suites dyn_ts_ipa* and voice using scenario modifiers In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10563 ) Change subject: Replace suites dyn_ts_ipa* and voice using scenario modifiers ...................................................................... Patch Set 2: Code-Review+2 very cool! -- To view, visit https://gerrit.osmocom.org/10563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80c441bb5b98d5d2e95d4c6ae1efab3e5f3c40d9 Gerrit-Change-Number: 10563 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 22 Aug 2018 10:22:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 10:23:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 22 Aug 2018 10:23:30 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc, msc: Set mgw local-ip in cfg.tmpl In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10565 ) Change subject: osmo-bsc,msc: Set mgw local-ip in cfg.tmpl ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10565/1/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl File src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl: https://gerrit.osmocom.org/#/c/10565/1/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl at 27 PS1, Line 27: mgw remote-port 2427 (2427 is the default, isn't it? no need to set it?) -- To view, visit https://gerrit.osmocom.org/10565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id46aa337f12756f80d492bf3102db5b1449e2027 Gerrit-Change-Number: 10565 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 22 Aug 2018 10:23:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 10:26:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 22 Aug 2018 10:26:43 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10566 Change subject: abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr ...................................................................... abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr LOGPFOH uses the msgb through "foh", so we have to free msgb after calling it, not before. Fixes following ASAN report: 20180822120155990 DNM <0004> abis_nm.c:1889 OC=CHANNEL(03) INST=(00,01,06): Set Chan Attr (bts=0,trx=1,ts=6) ================================================================= ==16465==ERROR: AddressSanitizer: heap-use-after-free on address 0x61a00002b3f0 at pc 0x7f587f44c0db bp 0x7ffc59e31df0 sp 0x7ffc59e31de8 READ of size 1 at 0x61a00002b3f0 thread T0 #0 0x7f587f44c0da in abis_nm_dump_foh libosmocore/src/gsm/abis_nm.c:937 #1 0x561e09e1532c in abis_nm_set_channel_attr osmo-bsc/src/osmo-bsc/abis_nm.c:1892 #2 0x561e09efd269 in nm_statechg_event osmo-bsc/src/osmo-bsc/bts_ipaccess_nanobts.c:168 #3 0x561e09efd269 in bts_ipa_nm_sig_cb osmo-bsc/src/osmo-bsc/bts_ipaccess_nanobts.c:335 #4 0x7f587efb3d16 in osmo_signal_dispatch libosmocore/src/signal.c:120 #5 0x561e09e18e31 in abis_nm_rx_statechg_rep osmo-bsc/src/osmo-bsc/abis_nm.c:255 #6 0x561e09e18e31 in abis_nm_rcvmsg_report osmo-bsc/src/osmo-bsc/abis_nm.c:380 #7 0x561e09e18e31 in abis_nm_rcvmsg_fom osmo-bsc/src/osmo-bsc/abis_nm.c:778 #8 0x561e09e1dc19 in abis_nm_rcvmsg osmo-bsc/src/osmo-bsc/abis_nm.c:926 #9 0x7f587ec90cc2 in handle_ts1_read input/ipaccess.c:274 #10 0x7f587ec90cc2 in ipaccess_fd_cb input/ipaccess.c:389 #11 0x7f587efb1ca8 in osmo_fd_disp_fds libosmocore/src/select.c:217 #12 0x7f587efb1ca8 in osmo_select_main libosmocore/src/select.c:257 #13 0x561e09e049d6 in main osmo-bsc/src/osmo-bsc/osmo_bsc_main.c:922 #14 0x7f587d53a2e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #15 0x561e09e054e9 in _start (/bin/osmo-bsc+0x34d4e9) Fixes: OS#3494 Change-Id: I030117abfdcee387516a4dea7e1e6a9bae8055f6 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/10566/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index d056bc4..f59a4fe 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1888,9 +1888,9 @@ DEBUGPFOH(DNM, foh, "Set Chan Attr %s\n", gsm_ts_name(ts)); if (verify_chan_comb(ts, chan_comb, &reason) < 0) { - msgb_free(msg); LOGPFOH(DNM, LOGL_ERROR, foh, "Invalid Channel Combination %d on %s. Reason: %s\n", chan_comb, gsm_ts_name(ts), reason); + msgb_free(msg); return -EINVAL; } ts->nm_chan_comb = chan_comb; -- To view, visit https://gerrit.osmocom.org/10566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I030117abfdcee387516a4dea7e1e6a9bae8055f6 Gerrit-Change-Number: 10566 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 10:26:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 22 Aug 2018 10:26:43 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Fix trailing whitespacing Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10567 Change subject: abis_nm: Fix trailing whitespacing ...................................................................... abis_nm: Fix trailing whitespacing Change-Id: Ia434b349e85019d2224a6f9a699058dccc6072dc --- M src/osmo-bsc/abis_nm.c 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/10567/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f59a4fe..1092173 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1041,7 +1041,7 @@ sw_add_file_id_and_ver(sw, msg); msgb_tv_put(msg, NM_ATT_WINDOW_SIZE, sw->window_size); - + return abis_nm_sendmsg(sw->bts, msg); } @@ -1252,7 +1252,7 @@ sw->file_version_len = strlen(file_version); /* rewind to start of file */ rewind(sw->stream); - break; + break; case GSM_BTS_TYPE_NANOBTS: /* TODO: extract that from the filename or content */ rc = parse_sdp_header(sw); @@ -1274,7 +1274,7 @@ return 0; } - + static void sw_close_file(struct abis_nm_sw *sw) { switch (sw->bts->type) { @@ -1310,7 +1310,7 @@ int rc = -1; struct abis_nm_sw *sw = &g_sw; enum sw_state old_state = sw->state; - + //DEBUGP(DNM, "state %u, NM MT 0x%02x\n", sw->state, foh->msg_type); switch (sw->state) { @@ -1557,7 +1557,7 @@ ch->attrib = NM_ATT_ABIS_CHANNEL; ch->bts_port = bts_port; ch->timeslot = ts_nr; - ch->subslot = subslot_nr; + ch->subslot = subslot_nr; } int abis_nm_establish_tei(struct gsm_bts *bts, uint8_t trx_nr, @@ -1572,7 +1572,7 @@ oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, len, NM_MT_ESTABLISH_TEI, NM_OC_RADIO_CARRIER, bts->bts_nr, trx_nr, 0xff); - + msgb_tv_put(msg, NM_ATT_TEI, tei); ch = (struct abis_nm_channel *) msgb_put(msg, sizeof(*ch)); @@ -1593,7 +1593,7 @@ oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, sizeof(*ch), NM_MT_CONN_TERR_SIGN, NM_OC_RADIO_CARRIER, bts->bts_nr, trx->nr, 0xff); - + ch = (struct abis_nm_channel *) msgb_put(msg, sizeof(*ch)); fill_nm_channel(ch, e1_port, e1_timeslot, e1_subslot); @@ -2313,7 +2313,7 @@ fill_om_fom_hdr(oh, 0, NM_MT_BS11_LMT_LOGOFF, NM_OC_BS11_BTSE, 0xff, 0xff, 0xff); } - + return abis_nm_sendmsg(bts, msg); } @@ -2340,7 +2340,7 @@ struct abis_om_hdr *oh; struct msgb *msg; uint8_t tlv_value; - + msg = nm_msgb_alloc(); oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 3, NM_MT_BS11_SET_ATTR, NM_OC_BS11, @@ -2350,9 +2350,9 @@ tlv_value = BS11_LI_PLL_LOCKED; else tlv_value = BS11_LI_PLL_STANDALONE; - + msgb_tlv_put(msg, NM_ATT_BS11_PLL_MODE, 1, &tlv_value); - + return abis_nm_sendmsg(bts, msg); } @@ -2410,7 +2410,7 @@ lh = queue->next; llist_del(lh); - + return llist_entry(lh, struct file_list_entry, list); } @@ -2439,7 +2439,7 @@ if (strlen(linebuf) < 4) continue; - + rc = sscanf(linebuf+4, "%12s:%80s\r\n", file_id, file_version); if (rc < 0) { perror("ERR parsing SWL file"); @@ -2460,7 +2460,7 @@ strncat(fle->fname, dirname(dir), sizeof(fle->fname) - 1); strcat(fle->fname, "/"); strncat(fle->fname, file_id, sizeof(fle->fname) - 1 -strlen(fle->fname)); - + llist_add_tail(&fle->list, &bs11_sw->file_list); } @@ -2562,7 +2562,7 @@ NM_ATT_FILE_VERSION, NM_ATT_OPER_STATE, 0xe8, NM_ATT_BS11_ALL_TEST_CATG, NM_ATT_SW_DESCR, NM_ATT_GET_ARI }; #endif - + static uint8_t req_attr[] = { NM_ATT_ADM_STATE, NM_ATT_AVAIL_STATUS, 0xa8, NM_ATT_OPER_STATE, 0xd5, 0xa1, NM_ATT_BS11_ESN_FW_CODE_NO, NM_ATT_BS11_ESN_HW_CODE_NO, -- To view, visit https://gerrit.osmocom.org/10567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia434b349e85019d2224a6f9a699058dccc6072dc Gerrit-Change-Number: 10567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 10:28:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 22 Aug 2018 10:28:53 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10566 ) Change subject: abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr ...................................................................... Patch Set 1: Code-Review+2 oof, probably my fault too -- To view, visit https://gerrit.osmocom.org/10566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I030117abfdcee387516a4dea7e1e6a9bae8055f6 Gerrit-Change-Number: 10566 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 22 Aug 2018 10:28:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 10:34:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 22 Aug 2018 10:34:03 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10566 ) Change subject: abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr ...................................................................... abis_nm: Fix heap-use-after-free in abis_nm_set_channel_attr LOGPFOH uses the msgb through "foh", so we have to free msgb after calling it, not before. Fixes following ASAN report: 20180822120155990 DNM <0004> abis_nm.c:1889 OC=CHANNEL(03) INST=(00,01,06): Set Chan Attr (bts=0,trx=1,ts=6) ================================================================= ==16465==ERROR: AddressSanitizer: heap-use-after-free on address 0x61a00002b3f0 at pc 0x7f587f44c0db bp 0x7ffc59e31df0 sp 0x7ffc59e31de8 READ of size 1 at 0x61a00002b3f0 thread T0 #0 0x7f587f44c0da in abis_nm_dump_foh libosmocore/src/gsm/abis_nm.c:937 #1 0x561e09e1532c in abis_nm_set_channel_attr osmo-bsc/src/osmo-bsc/abis_nm.c:1892 #2 0x561e09efd269 in nm_statechg_event osmo-bsc/src/osmo-bsc/bts_ipaccess_nanobts.c:168 #3 0x561e09efd269 in bts_ipa_nm_sig_cb osmo-bsc/src/osmo-bsc/bts_ipaccess_nanobts.c:335 #4 0x7f587efb3d16 in osmo_signal_dispatch libosmocore/src/signal.c:120 #5 0x561e09e18e31 in abis_nm_rx_statechg_rep osmo-bsc/src/osmo-bsc/abis_nm.c:255 #6 0x561e09e18e31 in abis_nm_rcvmsg_report osmo-bsc/src/osmo-bsc/abis_nm.c:380 #7 0x561e09e18e31 in abis_nm_rcvmsg_fom osmo-bsc/src/osmo-bsc/abis_nm.c:778 #8 0x561e09e1dc19 in abis_nm_rcvmsg osmo-bsc/src/osmo-bsc/abis_nm.c:926 #9 0x7f587ec90cc2 in handle_ts1_read input/ipaccess.c:274 #10 0x7f587ec90cc2 in ipaccess_fd_cb input/ipaccess.c:389 #11 0x7f587efb1ca8 in osmo_fd_disp_fds libosmocore/src/select.c:217 #12 0x7f587efb1ca8 in osmo_select_main libosmocore/src/select.c:257 #13 0x561e09e049d6 in main osmo-bsc/src/osmo-bsc/osmo_bsc_main.c:922 #14 0x7f587d53a2e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #15 0x561e09e054e9 in _start (/bin/osmo-bsc+0x34d4e9) Fixes: OS#3494 Change-Id: I030117abfdcee387516a4dea7e1e6a9bae8055f6 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index d056bc4..f59a4fe 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1888,9 +1888,9 @@ DEBUGPFOH(DNM, foh, "Set Chan Attr %s\n", gsm_ts_name(ts)); if (verify_chan_comb(ts, chan_comb, &reason) < 0) { - msgb_free(msg); LOGPFOH(DNM, LOGL_ERROR, foh, "Invalid Channel Combination %d on %s. Reason: %s\n", chan_comb, gsm_ts_name(ts), reason); + msgb_free(msg); return -EINVAL; } ts->nm_chan_comb = chan_comb; -- To view, visit https://gerrit.osmocom.org/10566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I030117abfdcee387516a4dea7e1e6a9bae8055f6 Gerrit-Change-Number: 10566 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 11:11:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 22 Aug 2018 11:11:52 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Use osmo_fd_setup to set up callbacks Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10568 Change subject: ipaccess: Use osmo_fd_setup to set up callbacks ...................................................................... ipaccess: Use osmo_fd_setup to set up callbacks We have a public API in libosmocore, so let's use it istead of manually filling each struct field. Change-Id: I09479c3d5b0b9bd69a56c080b8c533a32824cc66 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/68/10568/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 3d2fa44..6f41c97 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -189,11 +189,9 @@ newbfd = &ts->driver.ipaccess.fd; /* get rid of our old temporary bfd */ - newbfd->fd = bfd->fd; - newbfd->when |= bfd->when; /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ - newbfd->cb = bfd->cb; - newbfd->data = bfd->data; - newbfd->priv_nr = E1INP_SIGN_RSL + unit_data.trx_id; + /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ + osmo_fd_setup(newbfd, bfd->fd, bfd->when, bfd->cb, + bfd->data, E1INP_SIGN_RSL + unit_data.trx_id); osmo_fd_unregister(bfd); bfd->fd = -1; ret = osmo_fd_register(newbfd); @@ -479,11 +477,7 @@ e1i_ts = &line->ts[idx]; bfd = &e1i_ts->driver.ipaccess.fd; - bfd->fd = fd; - bfd->data = line; - bfd->priv_nr = E1INP_SIGN_OML; - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ; + osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_OML); ret = osmo_fd_register(bfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); @@ -535,11 +529,7 @@ e1i_ts = &line->ts[E1INP_SIGN_RSL-1]; bfd = &e1i_ts->driver.ipaccess.fd; - bfd->fd = fd; - bfd->data = line; - bfd->priv_nr = E1INP_SIGN_RSL; - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ; + osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_RSL); ret = osmo_fd_register(bfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); -- To view, visit https://gerrit.osmocom.org/10568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I09479c3d5b0b9bd69a56c080b8c533a32824cc66 Gerrit-Change-Number: 10568 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 12:17:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 22 Aug 2018 12:17:53 +0000 Subject: Change in libosmocore[master]: ipa: Documnt ipa_msg_recv* functions Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10569 Change subject: ipa: Documnt ipa_msg_recv* functions ...................................................................... ipa: Documnt ipa_msg_recv* functions Change-Id: Ie81e9dd9f9936a414e7cebb2bccffa6f42a302a7 --- M src/gsm/ipa.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/10569/1 diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 508cc13..d423c26 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -528,6 +528,9 @@ #ifdef HAVE_SYS_SOCKET_H #include +/*! Read one ipa message from socket fd without caching not fully received + * messages. See \ref ipa_msg_recv_buffered for further information. + */ int ipa_msg_recv(int fd, struct msgb **rmsg) { int rc = ipa_msg_recv_buffered(fd, rmsg, NULL); @@ -538,6 +541,25 @@ return rc; } +/*! Read one ipa message from socket fd or store part if still not fully received. + * \param[in] fd The fd for the socket to read from. + * \param[out] rmsg internally allocated msgb containing a fully received ipa message. + * \param[inout] tmp_msg internally allocated msgb caching data for not yet fully received message. + * + * As ipa can run on top of stream based protocols such as TCP, there's the + * possibility that such lower layers split ipa messages in several low level + * packets. If a low layer packet is received containing several ipa frames, + * this function will pull from the socket and return only the first one + * available in the stream. As the socket will remain with data, it will + * trigger again during next select() and then this function will fetch the + * next ipa message, and so on. + * + * \returns -EAGAIN and allocated tmp_msg if message was not yet fully + * received. Other negative values indicate an error and cached msgb will be + * freed. 0 if socket is found dead. Positive value indicating l2 msgb len and + * rmsg pointing to internally allocated msgb containing the ipa frame on + * scucess. + */ int ipa_msg_recv_buffered(int fd, struct msgb **rmsg, struct msgb **tmp_msg) { struct msgb *msg = tmp_msg ? *tmp_msg : NULL; -- To view, visit https://gerrit.osmocom.org/10569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie81e9dd9f9936a414e7cebb2bccffa6f42a302a7 Gerrit-Change-Number: 10569 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 12:18:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 22 Aug 2018 12:18:06 +0000 Subject: Change in libosmocore[master]: ipa: Document ipa_msg_recv* functions In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10569 ) Change subject: ipa: Document ipa_msg_recv* functions ...................................................................... ipa: Document ipa_msg_recv* functions Change-Id: Ie81e9dd9f9936a414e7cebb2bccffa6f42a302a7 --- M src/gsm/ipa.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/10569/2 -- To view, visit https://gerrit.osmocom.org/10569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie81e9dd9f9936a414e7cebb2bccffa6f42a302a7 Gerrit-Change-Number: 10569 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 22 15:13:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 22 Aug 2018 15:13:16 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#223?= In-Reply-To: <1184480258.64.1534864206966.JavaMail.jenkins@jenkins.osmocom.org> References: <1184480258.64.1534864206966.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <635335863.77.1534950796073.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:07:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 22 Aug 2018 19:07:18 +0000 Subject: Change in osmo-bts[master]: fix conditions for sending fill frames during RTS IND In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10280 ) Change subject: fix conditions for sending fill frames during RTS IND ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibaf3ecbd0bde4f37e799d5e2f5d00dc695e0139a Gerrit-Change-Number: 10280 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 22 Aug 2018 19:07:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:50:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:50:26 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10415 ) Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 22 Aug 2018 19:50:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:50:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:50:31 +0000 Subject: Change in osmo-bts[master]: fix conditions for sending fill frames during RTS IND In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10280 ) Change subject: fix conditions for sending fill frames during RTS IND ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibaf3ecbd0bde4f37e799d5e2f5d00dc695e0139a Gerrit-Change-Number: 10280 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 22 Aug 2018 19:50:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:50:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:50:33 +0000 Subject: Change in osmo-bts[master]: fix conditions for sending fill frames during RTS IND In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10280 ) Change subject: fix conditions for sending fill frames during RTS IND ...................................................................... fix conditions for sending fill frames during RTS IND Rewrite an if-statement to better match the description given in GSM 05.08, and quote the relevant paragraph in a comment. Since this entire block of code only runs for SDCCH and TCH, this new condition should provide the same result expect that in accordance with the standard we now stop sending fill-frames on a signalling TCH if DTX is in use. Also note that this code should already cover parts of the patch proposed at https://gerrit.osmocom.org/c/osmo-bts/+/5753 The changes to osmo-bts-litecell15/l1_if.c proposed there should be equivalent to the fill-frame logic in this existing common BTS code which is handling RTS IND. Change-Id: Ibaf3ecbd0bde4f37e799d5e2f5d00dc695e0139a Related: OS#1950 --- M src/common/l1sap.c 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 00ead8d..b8cec0e 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -754,9 +754,16 @@ memcpy(p + 2, si, GSM_MACBLOCK_LEN - 2); } else memcpy(p + 2, fill_frame, GSM_MACBLOCK_LEN - 2); - } else if ((!L1SAP_IS_CHAN_TCHF(chan_nr) && !L1SAP_IS_CHAN_TCHH(chan_nr)) - || lchan->rsl_cmode == RSL_CMOD_SPD_SIGN) { - /* send fill frame only, if not TCH/x != Signalling, otherwise send empty frame */ + } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr) || + (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN && !lchan->ts->trx->bts->dtxd)) { + /* + * SDCCH or TCH in signalling mode without DTX. + * + * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the + * half rate speech traffic channel in signalling only mode DTX is not allowed. + * In these cases and during signalling on the TCH when DTX is not used, the same + * L2 fill frame shall be transmitted in case there is nothing else to transmit." + */ p = msgb_put(msg, GSM_MACBLOCK_LEN); memcpy(p, fill_frame, GSM_MACBLOCK_LEN); } /* else the message remains empty, so TCH frames are sent */ -- To view, visit https://gerrit.osmocom.org/10280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibaf3ecbd0bde4f37e799d5e2f5d00dc695e0139a Gerrit-Change-Number: 10280 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:50:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:50:34 +0000 Subject: Change in osmo-bts[master]: send TCH/F fill frames in DTX mode (WIP) In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10415 ) Change subject: send TCH/F fill frames in DTX mode (WIP) ...................................................................... send TCH/F fill frames in DTX mode (WIP) Send DTX TCH fill frames according to GSM 05.08, section 8.3. Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Related: OS#1950 --- M src/common/l1sap.c 1 file changed, 64 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b8cec0e..5cc303b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -666,6 +666,31 @@ return 0; } + /* Determine whether we need to send a DTX TCH fill frame according to GSM 05.08, section 8.3. */ +static bool is_required_tchf_fill_frame_dtx(uint32_t fn, struct gsm_time *g_time) { + /* On TCHF this subset of TDMA frames (mod 104) is always used for transmission during DTX: */ + const int tchf_required_fn_dtx[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; + /* And the subset of those frames which corresponds to a TCH/F block boundary, + * which is the level at which L1SAP operates: */ + const int tchf_required_block_fn_dtx[] = { 52, 56 }; + int i; + + for (i = 0; i < ARRAY_SIZE(tchf_required_block_fn_dtx); i++) { + if (fn % 104 == tchf_required_block_fn_dtx[i]) + return true; + } + + /* We should only see block-level frame numbers here. Log a warning otherwise. */ + for (i = 0; i < ARRAY_SIZE(tchf_required_fn_dtx); i++) { + if (fn % 104 == tchf_required_fn_dtx[i]) + LOGPGT(DL1P, LOGL_NOTICE, g_time, + "Unexpected TCH/F frame number received in RTS.IND " + "(not at TCH/F block boundary): %u (mod 104: %u)\n", fn, fn % 104); + } + + return false; +} + /* PH-RTS-IND prim received from bts model */ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *rts_ind) @@ -725,14 +750,18 @@ si = bts_sysinfo_get(trx->bts, &g_time); if (si) memcpy(p, si, GSM_MACBLOCK_LEN); - else + else { memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame BCCH chan_nr=%d fn=%u\n", chan_nr, fn); + } } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ + bool dtxd = false; lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); return 0; } + dtxd = lchan->ts->trx->bts->dtxd; if (L1SAP_IS_LINK_SACCH(link_id)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ @@ -752,20 +781,39 @@ if (si) { /* The +2 is empty space where the DSP inserts the L1 hdr */ memcpy(p + 2, si, GSM_MACBLOCK_LEN - 2); - } else + } else { memcpy(p + 2, fill_frame, GSM_MACBLOCK_LEN - 2); - } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr) || - (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN && !lchan->ts->trx->bts->dtxd)) { - /* - * SDCCH or TCH in signalling mode without DTX. - * - * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the - * half rate speech traffic channel in signalling only mode DTX is not allowed. - * In these cases and during signalling on the TCH when DTX is not used, the same - * L2 fill frame shall be transmitted in case there is nothing else to transmit." - */ + DEBUGPGT(DL1P, &g_time, "sending fill frame SACCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + } + } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame SDCCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + } else if (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN) { + if (dtxd_facch) { + /* + * TCH in signalling mode with DTX. + * Send fill frame according to GSM 05.08, section 8.3. + */ + if (L1SAP_IS_CHAN_TCHF(chan_nr) && is_required_tchf_fill_frame_dtx(fn, &g_time)) { + p = msgb_put(msg, GSM_MACBLOCK_LEN); + memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + //dtx_dispatch(lchan, E_FACCH); /* XXX is this needed? */ + } + } else { + /* + * TCH in signalling mode without DTX. + * + * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the + * half rate speech traffic channel in signalling only mode DTX is not allowed. + * In these cases and during signalling on the TCH when DTX is not used, the same + * L2 fill frame shall be transmitted in case there is nothing else to transmit." + */ + p = msgb_put(msg, GSM_MACBLOCK_LEN); + memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); + } } /* else the message remains empty, so TCH frames are sent */ } else { /* The +2 is empty space where the DSP inserts the L1 hdr */ @@ -786,8 +834,10 @@ rc = bts_ccch_copy_msg(trx->bts, p, &g_time, (L1SAP_FN2CCCHBLOCK(fn) < num_agch(trx, "PH-RTS-IND"))); - if (rc <= 0) + if (rc <= 0) { memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + DEBUGPGT(DL1P, &g_time, "sending fill frame AGCH PCH chan_nr=%d fn=%u\n", chan_nr, fn); + } } DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id); @@ -1436,6 +1486,7 @@ char name[32]; snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr); + LOGP(DL1C, LOGL_NOTICE, "allocating DTX FSM for chan_nr=%d\n", chan_nr); lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm, tall_bts_ctx, lchan, -- To view, visit https://gerrit.osmocom.org/10415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 Gerrit-Change-Number: 10415 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:50:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:50:51 +0000 Subject: Change in libosmocore[master]: ipa: Document ipa_msg_recv* functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10569 ) Change subject: ipa: Document ipa_msg_recv* functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie81e9dd9f9936a414e7cebb2bccffa6f42a302a7 Gerrit-Change-Number: 10569 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 22 Aug 2018 19:50:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:50:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:50:52 +0000 Subject: Change in libosmocore[master]: ipa: Document ipa_msg_recv* functions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10569 ) Change subject: ipa: Document ipa_msg_recv* functions ...................................................................... ipa: Document ipa_msg_recv* functions Change-Id: Ie81e9dd9f9936a414e7cebb2bccffa6f42a302a7 --- M src/gsm/ipa.c 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 508cc13..d423c26 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -528,6 +528,9 @@ #ifdef HAVE_SYS_SOCKET_H #include +/*! Read one ipa message from socket fd without caching not fully received + * messages. See \ref ipa_msg_recv_buffered for further information. + */ int ipa_msg_recv(int fd, struct msgb **rmsg) { int rc = ipa_msg_recv_buffered(fd, rmsg, NULL); @@ -538,6 +541,25 @@ return rc; } +/*! Read one ipa message from socket fd or store part if still not fully received. + * \param[in] fd The fd for the socket to read from. + * \param[out] rmsg internally allocated msgb containing a fully received ipa message. + * \param[inout] tmp_msg internally allocated msgb caching data for not yet fully received message. + * + * As ipa can run on top of stream based protocols such as TCP, there's the + * possibility that such lower layers split ipa messages in several low level + * packets. If a low layer packet is received containing several ipa frames, + * this function will pull from the socket and return only the first one + * available in the stream. As the socket will remain with data, it will + * trigger again during next select() and then this function will fetch the + * next ipa message, and so on. + * + * \returns -EAGAIN and allocated tmp_msg if message was not yet fully + * received. Other negative values indicate an error and cached msgb will be + * freed. 0 if socket is found dead. Positive value indicating l2 msgb len and + * rmsg pointing to internally allocated msgb containing the ipa frame on + * scucess. + */ int ipa_msg_recv_buffered(int fd, struct msgb **rmsg, struct msgb **tmp_msg) { struct msgb *msg = tmp_msg ? *tmp_msg : NULL; -- To view, visit https://gerrit.osmocom.org/10569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie81e9dd9f9936a414e7cebb2bccffa6f42a302a7 Gerrit-Change-Number: 10569 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:51:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:51:05 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Use osmo_fd_setup to set up callbacks In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10568 ) Change subject: ipaccess: Use osmo_fd_setup to set up callbacks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I09479c3d5b0b9bd69a56c080b8c533a32824cc66 Gerrit-Change-Number: 10568 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 22 Aug 2018 19:51:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:51:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:51:06 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Use osmo_fd_setup to set up callbacks In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10568 ) Change subject: ipaccess: Use osmo_fd_setup to set up callbacks ...................................................................... ipaccess: Use osmo_fd_setup to set up callbacks We have a public API in libosmocore, so let's use it istead of manually filling each struct field. Change-Id: I09479c3d5b0b9bd69a56c080b8c533a32824cc66 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 3d2fa44..6f41c97 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -189,11 +189,9 @@ newbfd = &ts->driver.ipaccess.fd; /* get rid of our old temporary bfd */ - newbfd->fd = bfd->fd; - newbfd->when |= bfd->when; /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ - newbfd->cb = bfd->cb; - newbfd->data = bfd->data; - newbfd->priv_nr = E1INP_SIGN_RSL + unit_data.trx_id; + /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ + osmo_fd_setup(newbfd, bfd->fd, bfd->when, bfd->cb, + bfd->data, E1INP_SIGN_RSL + unit_data.trx_id); osmo_fd_unregister(bfd); bfd->fd = -1; ret = osmo_fd_register(newbfd); @@ -479,11 +477,7 @@ e1i_ts = &line->ts[idx]; bfd = &e1i_ts->driver.ipaccess.fd; - bfd->fd = fd; - bfd->data = line; - bfd->priv_nr = E1INP_SIGN_OML; - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ; + osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_OML); ret = osmo_fd_register(bfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); @@ -535,11 +529,7 @@ e1i_ts = &line->ts[E1INP_SIGN_RSL-1]; bfd = &e1i_ts->driver.ipaccess.fd; - bfd->fd = fd; - bfd->data = line; - bfd->priv_nr = E1INP_SIGN_RSL; - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ; + osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_RSL); ret = osmo_fd_register(bfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); -- To view, visit https://gerrit.osmocom.org/10568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I09479c3d5b0b9bd69a56c080b8c533a32824cc66 Gerrit-Change-Number: 10568 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:51:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:51:17 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Fix trailing whitespacing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10567 ) Change subject: abis_nm: Fix trailing whitespacing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia434b349e85019d2224a6f9a699058dccc6072dc Gerrit-Change-Number: 10567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 22 Aug 2018 19:51:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:51:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:51:18 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Fix trailing whitespacing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10567 ) Change subject: abis_nm: Fix trailing whitespacing ...................................................................... abis_nm: Fix trailing whitespacing Change-Id: Ia434b349e85019d2224a6f9a699058dccc6072dc --- M src/osmo-bsc/abis_nm.c 1 file changed, 15 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f59a4fe..1092173 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1041,7 +1041,7 @@ sw_add_file_id_and_ver(sw, msg); msgb_tv_put(msg, NM_ATT_WINDOW_SIZE, sw->window_size); - + return abis_nm_sendmsg(sw->bts, msg); } @@ -1252,7 +1252,7 @@ sw->file_version_len = strlen(file_version); /* rewind to start of file */ rewind(sw->stream); - break; + break; case GSM_BTS_TYPE_NANOBTS: /* TODO: extract that from the filename or content */ rc = parse_sdp_header(sw); @@ -1274,7 +1274,7 @@ return 0; } - + static void sw_close_file(struct abis_nm_sw *sw) { switch (sw->bts->type) { @@ -1310,7 +1310,7 @@ int rc = -1; struct abis_nm_sw *sw = &g_sw; enum sw_state old_state = sw->state; - + //DEBUGP(DNM, "state %u, NM MT 0x%02x\n", sw->state, foh->msg_type); switch (sw->state) { @@ -1557,7 +1557,7 @@ ch->attrib = NM_ATT_ABIS_CHANNEL; ch->bts_port = bts_port; ch->timeslot = ts_nr; - ch->subslot = subslot_nr; + ch->subslot = subslot_nr; } int abis_nm_establish_tei(struct gsm_bts *bts, uint8_t trx_nr, @@ -1572,7 +1572,7 @@ oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, len, NM_MT_ESTABLISH_TEI, NM_OC_RADIO_CARRIER, bts->bts_nr, trx_nr, 0xff); - + msgb_tv_put(msg, NM_ATT_TEI, tei); ch = (struct abis_nm_channel *) msgb_put(msg, sizeof(*ch)); @@ -1593,7 +1593,7 @@ oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, sizeof(*ch), NM_MT_CONN_TERR_SIGN, NM_OC_RADIO_CARRIER, bts->bts_nr, trx->nr, 0xff); - + ch = (struct abis_nm_channel *) msgb_put(msg, sizeof(*ch)); fill_nm_channel(ch, e1_port, e1_timeslot, e1_subslot); @@ -2313,7 +2313,7 @@ fill_om_fom_hdr(oh, 0, NM_MT_BS11_LMT_LOGOFF, NM_OC_BS11_BTSE, 0xff, 0xff, 0xff); } - + return abis_nm_sendmsg(bts, msg); } @@ -2340,7 +2340,7 @@ struct abis_om_hdr *oh; struct msgb *msg; uint8_t tlv_value; - + msg = nm_msgb_alloc(); oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 3, NM_MT_BS11_SET_ATTR, NM_OC_BS11, @@ -2350,9 +2350,9 @@ tlv_value = BS11_LI_PLL_LOCKED; else tlv_value = BS11_LI_PLL_STANDALONE; - + msgb_tlv_put(msg, NM_ATT_BS11_PLL_MODE, 1, &tlv_value); - + return abis_nm_sendmsg(bts, msg); } @@ -2410,7 +2410,7 @@ lh = queue->next; llist_del(lh); - + return llist_entry(lh, struct file_list_entry, list); } @@ -2439,7 +2439,7 @@ if (strlen(linebuf) < 4) continue; - + rc = sscanf(linebuf+4, "%12s:%80s\r\n", file_id, file_version); if (rc < 0) { perror("ERR parsing SWL file"); @@ -2460,7 +2460,7 @@ strncat(fle->fname, dirname(dir), sizeof(fle->fname) - 1); strcat(fle->fname, "/"); strncat(fle->fname, file_id, sizeof(fle->fname) - 1 -strlen(fle->fname)); - + llist_add_tail(&fle->list, &bs11_sw->file_list); } @@ -2562,7 +2562,7 @@ NM_ATT_FILE_VERSION, NM_ATT_OPER_STATE, 0xe8, NM_ATT_BS11_ALL_TEST_CATG, NM_ATT_SW_DESCR, NM_ATT_GET_ARI }; #endif - + static uint8_t req_attr[] = { NM_ATT_ADM_STATE, NM_ATT_AVAIL_STATUS, 0xa8, NM_ATT_OPER_STATE, 0xd5, 0xa1, NM_ATT_BS11_ESN_FW_CODE_NO, NM_ATT_BS11_ESN_HW_CODE_NO, -- To view, visit https://gerrit.osmocom.org/10567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia434b349e85019d2224a6f9a699058dccc6072dc Gerrit-Change-Number: 10567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:52:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:52:12 +0000 Subject: Change in osmo-bts[master]: measurement: fix measurement interval end detection In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10564 ) Change subject: measurement: fix measurement interval end detection ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If8a269ecd3f9fa4eeadf379114db816ef5c77d77 Gerrit-Change-Number: 10564 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 22 Aug 2018 19:52:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:52:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:52:14 +0000 Subject: Change in osmo-bts[master]: measurement: fix measurement interval end detection In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10564 ) Change subject: measurement: fix measurement interval end detection ...................................................................... measurement: fix measurement interval end detection for SDDCH4 channels, the detection is not working correctly since the function uses the lookup table for SDCCH8 interval endings there. This needs to be corrected. Also there are two unnecessary assignments in the code which should be removed. - use correct table (sdcch4_meas_rep_fn102 instead of sdcch8_meas_rep_fn102. - remove unnecessary assignments to last_fn_mod Change-Id: If8a269ecd3f9fa4eeadf379114db816ef5c77d77 Related: OS#2975 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/measurement.c b/src/common/measurement.c index 41844b1..cb45e6e 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -328,7 +328,6 @@ break; case GSM_PCHAN_TCH_H: modulus = 104; - last_fn_mod = lchan->meas.last_fn % 104; if (lchan->nr == 0) tbl = tchh0_meas_rep_fn104; else @@ -339,13 +338,12 @@ case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: modulus = 102; - last_fn_mod = lchan->meas.last_fn % 102; interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: modulus = 102; - interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; + interval_end = sdcch4_meas_rep_fn102[lchan->ts->nr]; break; default: return false; -- To view, visit https://gerrit.osmocom.org/10564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If8a269ecd3f9fa4eeadf379114db816ef5c77d77 Gerrit-Change-Number: 10564 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:52:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:52:32 +0000 Subject: Change in osmo-mgw[master]: cosmetic: log: fix "CallIDs does not match" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10558 ) Change subject: cosmetic: log: fix "CallIDs does not match" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I16f3bf1312f913b7a7f0d9ff5c42efa645c6a5b3 Gerrit-Change-Number: 10558 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 22 Aug 2018 19:52:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:52:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:52:33 +0000 Subject: Change in osmo-mgw[master]: cosmetic: log: fix "CallIDs does not match" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10558 ) Change subject: cosmetic: log: fix "CallIDs does not match" ...................................................................... cosmetic: log: fix "CallIDs does not match" Change-Id: I16f3bf1312f913b7a7f0d9ff5c42efa645c6a5b3 --- M src/libosmo-mgcp/mgcp_msg.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index a89c579..a5bef7b 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -414,7 +414,7 @@ if (strcmp(endp->callid, callid) != 0) { LOGP(DLMGCP, LOGL_ERROR, - "endpoint:0x%x CallIDs does not match '%s' != '%s'\n", + "endpoint:0x%x CallIDs mismatch: '%s' != '%s'\n", ENDPOINT_NUMBER(endp), endp->callid, callid); return -1; } -- To view, visit https://gerrit.osmocom.org/10558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I16f3bf1312f913b7a7f0d9ff5c42efa645c6a5b3 Gerrit-Change-Number: 10558 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:54:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:54:32 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10022 ) Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/10022/2/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/#/c/10022/2/src/libosmo-mgcp/mgcp_vty.c at 309 PS2, Line 309: return ret; why are we stopping to dump endpoints just because one of them earlier in the list exposes some oddity? I think the user still deserves to see all endpoints. -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 22 Aug 2018 19:54:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:55:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:55:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Reliably pass TC_cr_before_reset In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10561 ) Change subject: MSC_Tests: Reliably pass TC_cr_before_reset ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id745470231950e0a284f8c231246d3719f7617cc Gerrit-Change-Number: 10561 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 22 Aug 2018 19:55:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:55:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:55:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Reliably pass TC_cr_before_reset In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10561 ) Change subject: MSC_Tests: Reliably pass TC_cr_before_reset ...................................................................... MSC_Tests: Reliably pass TC_cr_before_reset I was able to reproduce the sporadic cr_before_reset failures by running both osmo-{stp,msc}-master with --cpus 0.1. In that case the first test run would fail for me because no BSSMAP RESET ACK was seen. Sleeping some seconds before sending the messages will make sure all components are connected. Note: TC_cr_before_reset is the first test executed in control so this seems to be why it sometimes fails in jenkins. Change-Id: Id745470231950e0a284f8c231246d3719f7617cc --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 42ad27c..4bdbc1d 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1765,6 +1765,8 @@ f_bssap_start(g_bssap[0]); + f_sleep(3.0); + /* Make a blind connection attemt, to trigger the deadlock condition */ BSSAP_DIRECT.send(ts_BSSAP_CONNECT_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, 1, omit)); -- To view, visit https://gerrit.osmocom.org/10561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id745470231950e0a284f8c231246d3719f7617cc Gerrit-Change-Number: 10561 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:56:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:56:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: log / comment tweaks In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9627 ) Change subject: log / comment tweaks ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c Gerrit-Change-Number: 9627 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 22 Aug 2018 19:56:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:56:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: log / comment tweaks In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9627 ) Change subject: log / comment tweaks ...................................................................... log / comment tweaks BSC_Tests: sprinkle logs to illustrate what the dyn PDCH tests expect. BSC_Tests: tweak comment to mention that inter-BSC HO MT *does* allow N-CONNECT from MSC. f_tc_assignment_fr_a5_1_codec_missing: mark the missing IE beyond doubt. Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c --- M bsc/BSC_Tests.ttcn 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e94b781..b44de9f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -518,7 +518,8 @@ * Assignment Testing ***********************************************************************/ -/* Verify that the BSC refuses any BSSAP connection from the MSC (They are all BSC->MSC direction) */ +/* Verify that the BSC refuses any BSSAP connection from the MSC (They are all BSC->MSC direction, + * except for the inter-BSC handover, MT side) */ testcase TC_outbound_connect() runs on test_CT { f_init(1); @@ -1630,6 +1631,8 @@ const OCT8 kc := '0001020304050607'O; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + /* Omit: ass_cmd.pdu.bssmap.assignmentRequest.codecList */ + f_establish_fully(ass_cmd, exp_fail); } testcase TC_assignment_fr_a5_1_codec_missing() runs on test_CT { @@ -2367,26 +2370,31 @@ var RslChannelNr chan_nr := valueof(t_RslChanNr_Bm(6)); + log("TCH/F_PDCH pchan starts out in TCH/F mode:"); f_ts_dyn_mode_assert(0, 0, chan_nr.tn, TCHF_MODE); /* The BSC will activate the dynamic PDCH by default, so confirm that */ rsl_unused := f_exp_ipa_rx(0, tr_RSL_IPA_PDCH_ACT(chan_nr)); f_ipa_tx(0, ts_RSL_IPA_PDCH_ACT_ACK(chan_nr, ts_RSL_IE_FrameNumber(2342))); f_sleep(1.0); + log("TCH/F_PDCH pchan, PDCH ACT was ACKed, so now in PDCH mode:"); f_ts_dyn_mode_assert(0, 0, chan_nr.tn, PDCH_MODE); /* De-activate it via VTY */ f_dyn_ipa_pdch_deact(0, 0, chan_nr.tn); f_sleep(1.0); + log("TCH/F_PDCH pchan, PDCH DEACT via VTY, so now back in TCH/F mode:"); f_ts_dyn_mode_assert(0, 0, chan_nr.tn, TCHF_MODE); /* re-activate it via VTY */ f_dyn_ipa_pdch_act(0, 0, chan_nr.tn); f_sleep(1.0); + log("TCH/F_PDCH pchan, PDCH ACT via VTY, so now in PDCH mode:"); f_ts_dyn_mode_assert(0, 0, chan_nr.tn, PDCH_MODE); /* and finally de-activate it again */ f_dyn_ipa_pdch_deact(0, 0, chan_nr.tn); f_sleep(1.0); + log("TCH/F_PDCH pchan, PDCH DEACT via VTY, so now back in TCH/F mode:"); f_ts_dyn_mode_assert(0, 0, chan_nr.tn, TCHF_MODE); /* clean up config */ @@ -2485,12 +2493,14 @@ var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6)); + log("TCH/F_TCH/H_PDCH pchan starts out in disabled mode:"); f_ts_dyn_mode_assert(0, 0, chan_nr.tn, NONE_MODE); /* The BSC will activate the dynamic PDCH by default, so confirm that */ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?)); f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342)); f_sleep(1.0); + log("TCH/F_TCH/H_PDCH requested to PDCH ACT on startup, which was ACKed, so now in PDCH:"); f_ts_dyn_mode_assert(0, 0, chan_nr.tn, PDCH_MODE); /* clean up config */ -- To view, visit https://gerrit.osmocom.org/9627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c Gerrit-Change-Number: 9627 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:56:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:56:34 +0000 Subject: Change in osmo-bsc[master]: fix lchan_rtp_fsm: missing event handling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10559 ) Change subject: fix lchan_rtp_fsm: missing event handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab233c592384902098644eee27bb8445fde3aa6f Gerrit-Change-Number: 10559 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 22 Aug 2018 19:56:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 22 19:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 22 Aug 2018 19:56:35 +0000 Subject: Change in osmo-bsc[master]: fix lchan_rtp_fsm: missing event handling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10559 ) Change subject: fix lchan_rtp_fsm: missing event handling ...................................................................... fix lchan_rtp_fsm: missing event handling Release and Rollback events are allowed but unhandled in states WAIT_MGW_CONFIGURED and ROLLBACK, and hence would result in an assertion. Add handling in these states. Change-Id: Iab233c592384902098644eee27bb8445fde3aa6f --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 2cc9a78..091af5e 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -467,6 +467,14 @@ lchan_rtp_fail("Error while redirecting the MGW to the lchan's RTP port"); return; + case LCHAN_RTP_EV_ROLLBACK: + lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_ROLLBACK); + return; + + case LCHAN_RTP_EV_RELEASE: + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, 0); + return; + default: OSMO_ASSERT(false); } @@ -533,6 +541,11 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, 0); return; + case LCHAN_RTP_EV_RELEASE: + case LCHAN_RTP_EV_ROLLBACK: + /* Already rolling back, ignore. */ + return; + default: OSMO_ASSERT(false); } -- To view, visit https://gerrit.osmocom.org/10559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab233c592384902098644eee27bb8445fde3aa6f Gerrit-Change-Number: 10559 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 08:45:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 23 Aug 2018 08:45:25 +0000 Subject: Change in pysim[master]: cards: autodetect sysmosim-gr1 Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10570 Change subject: cards: autodetect sysmosim-gr1 ...................................................................... cards: autodetect sysmosim-gr1 The sysmosim-gr1 lacks the auto detection feature because no autodetect is yet programmed inside the related class. - add autodetect for sysmosim-gr1 Change-Id: Iec1f1ab6824ff2328baedd731b08df997df4da01 Related: OS#3405 --- M pySim/cards.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/10570/1 diff --git a/pySim/cards.py b/pySim/cards.py index a72a52f..4dee0d8 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -387,6 +387,15 @@ """ name = 'sysmosim-gr1' + @classmethod + def autodetect(kls, scc): + try: + # Look for ATR + if scc.get_atr() == toBytes("3B 99 18 00 11 88 22 33 44 55 66 77 60"): + return kls(scc) + except: + return None + return None class SysmoUSIMgr1(Card): """ -- To view, visit https://gerrit.osmocom.org/10570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec1f1ab6824ff2328baedd731b08df997df4da01 Gerrit-Change-Number: 10570 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 08:45:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 23 Aug 2018 08:45:25 +0000 Subject: Change in pysim[master]: cards: do not feed ascii as adm for sysmosim-gr1 Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10571 Change subject: cards: do not feed ascii as adm for sysmosim-gr1 ...................................................................... cards: do not feed ascii as adm for sysmosim-gr1 When sysmosom-gr1 is used with a custom ADM key, then the ADM string is not fed through h2b() like we see it with sysmo-usim-sjs1 for example. - feed the ADM to h2b() before use Change-Id: I0b7cab380b89612ed3b8318e014161038335fe1b Related: OS#3405 --- M pySim/cards.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/10571/1 diff --git a/pySim/cards.py b/pySim/cards.py index 4dee0d8..e294f9a 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -338,7 +338,7 @@ # Authenticate using ADM PIN 5 if p['pin_adm']: - pin = p['pin_adm'] + pin = h2b(p['pin_adm']) else: pin = h2b("4444444444444444") self._scc.verify_chv(5, pin) -- To view, visit https://gerrit.osmocom.org/10571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0b7cab380b89612ed3b8318e014161038335fe1b Gerrit-Change-Number: 10571 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 08:45:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 23 Aug 2018 08:45:25 +0000 Subject: Change in pysim[master]: tests: add example file for sysmosim-gr1 Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10572 Change subject: tests: add example file for sysmosim-gr1 ...................................................................... tests: add example file for sysmosim-gr1 Change-Id: I36cfa81f9029bfaedd2e802a2d709596dbeb20ab Related: OS#3405 --- A tests/sysmosim-gr1.data.example 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/10572/1 diff --git a/tests/sysmosim-gr1.data.example b/tests/sysmosim-gr1.data.example new file mode 100644 index 0000000..90d23f8 --- /dev/null +++ b/tests/sysmosim-gr1.data.example @@ -0,0 +1,7 @@ +MCC=001 +MNC=01 +ICCID=1122334455667788990 +KI=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +OPC=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +IMSI=001010000000102 +ADM=DDDDDDDD -- To view, visit https://gerrit.osmocom.org/10572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I36cfa81f9029bfaedd2e802a2d709596dbeb20ab Gerrit-Change-Number: 10572 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 11:29:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 23 Aug 2018 11:29:16 +0000 Subject: Change in osmo-bts[master]: Revert "send TCH/F fill frames in DTX mode (WIP)" Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10573 Change subject: Revert "send TCH/F fill frames in DTX mode (WIP)" ...................................................................... Revert "send TCH/F fill frames in DTX mode (WIP)" This reverts commit 9bffa87c1195d2977d49244fbc3e3c0c9b65c318. This commit was not intended to be merged yet. Change-Id: Ibd8c0899451ae3c17bc07d4e112e32b4897405c9 --- M src/common/l1sap.c 1 file changed, 13 insertions(+), 64 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/10573/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 5cc303b..b8cec0e 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -666,31 +666,6 @@ return 0; } - /* Determine whether we need to send a DTX TCH fill frame according to GSM 05.08, section 8.3. */ -static bool is_required_tchf_fill_frame_dtx(uint32_t fn, struct gsm_time *g_time) { - /* On TCHF this subset of TDMA frames (mod 104) is always used for transmission during DTX: */ - const int tchf_required_fn_dtx[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; - /* And the subset of those frames which corresponds to a TCH/F block boundary, - * which is the level at which L1SAP operates: */ - const int tchf_required_block_fn_dtx[] = { 52, 56 }; - int i; - - for (i = 0; i < ARRAY_SIZE(tchf_required_block_fn_dtx); i++) { - if (fn % 104 == tchf_required_block_fn_dtx[i]) - return true; - } - - /* We should only see block-level frame numbers here. Log a warning otherwise. */ - for (i = 0; i < ARRAY_SIZE(tchf_required_fn_dtx); i++) { - if (fn % 104 == tchf_required_fn_dtx[i]) - LOGPGT(DL1P, LOGL_NOTICE, g_time, - "Unexpected TCH/F frame number received in RTS.IND " - "(not at TCH/F block boundary): %u (mod 104: %u)\n", fn, fn % 104); - } - - return false; -} - /* PH-RTS-IND prim received from bts model */ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *rts_ind) @@ -750,18 +725,14 @@ si = bts_sysinfo_get(trx->bts, &g_time); if (si) memcpy(p, si, GSM_MACBLOCK_LEN); - else { + else memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame BCCH chan_nr=%d fn=%u\n", chan_nr, fn); - } } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ - bool dtxd = false; lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); return 0; } - dtxd = lchan->ts->trx->bts->dtxd; if (L1SAP_IS_LINK_SACCH(link_id)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ @@ -781,39 +752,20 @@ if (si) { /* The +2 is empty space where the DSP inserts the L1 hdr */ memcpy(p + 2, si, GSM_MACBLOCK_LEN - 2); - } else { + } else memcpy(p + 2, fill_frame, GSM_MACBLOCK_LEN - 2); - DEBUGPGT(DL1P, &g_time, "sending fill frame SACCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - } - } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr)) { + } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr) || + (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN && !lchan->ts->trx->bts->dtxd)) { + /* + * SDCCH or TCH in signalling mode without DTX. + * + * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the + * half rate speech traffic channel in signalling only mode DTX is not allowed. + * In these cases and during signalling on the TCH when DTX is not used, the same + * L2 fill frame shall be transmitted in case there is nothing else to transmit." + */ p = msgb_put(msg, GSM_MACBLOCK_LEN); memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame SDCCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - } else if (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN) { - if (dtxd_facch) { - /* - * TCH in signalling mode with DTX. - * Send fill frame according to GSM 05.08, section 8.3. - */ - if (L1SAP_IS_CHAN_TCHF(chan_nr) && is_required_tchf_fill_frame_dtx(fn, &g_time)) { - p = msgb_put(msg, GSM_MACBLOCK_LEN); - memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - //dtx_dispatch(lchan, E_FACCH); /* XXX is this needed? */ - } - } else { - /* - * TCH in signalling mode without DTX. - * - * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the - * half rate speech traffic channel in signalling only mode DTX is not allowed. - * In these cases and during signalling on the TCH when DTX is not used, the same - * L2 fill frame shall be transmitted in case there is nothing else to transmit." - */ - p = msgb_put(msg, GSM_MACBLOCK_LEN); - memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - } } /* else the message remains empty, so TCH frames are sent */ } else { /* The +2 is empty space where the DSP inserts the L1 hdr */ @@ -834,10 +786,8 @@ rc = bts_ccch_copy_msg(trx->bts, p, &g_time, (L1SAP_FN2CCCHBLOCK(fn) < num_agch(trx, "PH-RTS-IND"))); - if (rc <= 0) { + if (rc <= 0) memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame AGCH PCH chan_nr=%d fn=%u\n", chan_nr, fn); - } } DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id); @@ -1486,7 +1436,6 @@ char name[32]; snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr); - LOGP(DL1C, LOGL_NOTICE, "allocating DTX FSM for chan_nr=%d\n", chan_nr); lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm, tall_bts_ctx, lchan, -- To view, visit https://gerrit.osmocom.org/10573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd8c0899451ae3c17bc07d4e112e32b4897405c9 Gerrit-Change-Number: 10573 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:04:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 12:04:40 +0000 Subject: Change in osmo-bts[master]: Revert "send TCH/F fill frames in DTX mode (WIP)" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10573 ) Change subject: Revert "send TCH/F fill frames in DTX mode (WIP)" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd8c0899451ae3c17bc07d4e112e32b4897405c9 Gerrit-Change-Number: 10573 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 23 Aug 2018 12:04:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:05:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 12:05:11 +0000 Subject: Change in osmo-bts[master]: Revert "send TCH/F fill frames in DTX mode (WIP)" In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10573 ) Change subject: Revert "send TCH/F fill frames in DTX mode (WIP)" ...................................................................... Revert "send TCH/F fill frames in DTX mode (WIP)" This reverts commit 9bffa87c1195d2977d49244fbc3e3c0c9b65c318. This commit was not intended to be merged yet. Change-Id: Ibd8c0899451ae3c17bc07d4e112e32b4897405c9 --- M src/common/l1sap.c 1 file changed, 13 insertions(+), 64 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 5cc303b..b8cec0e 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -666,31 +666,6 @@ return 0; } - /* Determine whether we need to send a DTX TCH fill frame according to GSM 05.08, section 8.3. */ -static bool is_required_tchf_fill_frame_dtx(uint32_t fn, struct gsm_time *g_time) { - /* On TCHF this subset of TDMA frames (mod 104) is always used for transmission during DTX: */ - const int tchf_required_fn_dtx[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; - /* And the subset of those frames which corresponds to a TCH/F block boundary, - * which is the level at which L1SAP operates: */ - const int tchf_required_block_fn_dtx[] = { 52, 56 }; - int i; - - for (i = 0; i < ARRAY_SIZE(tchf_required_block_fn_dtx); i++) { - if (fn % 104 == tchf_required_block_fn_dtx[i]) - return true; - } - - /* We should only see block-level frame numbers here. Log a warning otherwise. */ - for (i = 0; i < ARRAY_SIZE(tchf_required_fn_dtx); i++) { - if (fn % 104 == tchf_required_fn_dtx[i]) - LOGPGT(DL1P, LOGL_NOTICE, g_time, - "Unexpected TCH/F frame number received in RTS.IND " - "(not at TCH/F block boundary): %u (mod 104: %u)\n", fn, fn % 104); - } - - return false; -} - /* PH-RTS-IND prim received from bts model */ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *rts_ind) @@ -750,18 +725,14 @@ si = bts_sysinfo_get(trx->bts, &g_time); if (si) memcpy(p, si, GSM_MACBLOCK_LEN); - else { + else memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame BCCH chan_nr=%d fn=%u\n", chan_nr, fn); - } } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ - bool dtxd = false; lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr); return 0; } - dtxd = lchan->ts->trx->bts->dtxd; if (L1SAP_IS_LINK_SACCH(link_id)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ @@ -781,39 +752,20 @@ if (si) { /* The +2 is empty space where the DSP inserts the L1 hdr */ memcpy(p + 2, si, GSM_MACBLOCK_LEN - 2); - } else { + } else memcpy(p + 2, fill_frame, GSM_MACBLOCK_LEN - 2); - DEBUGPGT(DL1P, &g_time, "sending fill frame SACCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - } - } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr)) { + } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr) || + (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN && !lchan->ts->trx->bts->dtxd)) { + /* + * SDCCH or TCH in signalling mode without DTX. + * + * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the + * half rate speech traffic channel in signalling only mode DTX is not allowed. + * In these cases and during signalling on the TCH when DTX is not used, the same + * L2 fill frame shall be transmitted in case there is nothing else to transmit." + */ p = msgb_put(msg, GSM_MACBLOCK_LEN); memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame SDCCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - } else if (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN) { - if (dtxd_facch) { - /* - * TCH in signalling mode with DTX. - * Send fill frame according to GSM 05.08, section 8.3. - */ - if (L1SAP_IS_CHAN_TCHF(chan_nr) && is_required_tchf_fill_frame_dtx(fn, &g_time)) { - p = msgb_put(msg, GSM_MACBLOCK_LEN); - memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - //dtx_dispatch(lchan, E_FACCH); /* XXX is this needed? */ - } - } else { - /* - * TCH in signalling mode without DTX. - * - * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the - * half rate speech traffic channel in signalling only mode DTX is not allowed. - * In these cases and during signalling on the TCH when DTX is not used, the same - * L2 fill frame shall be transmitted in case there is nothing else to transmit." - */ - p = msgb_put(msg, GSM_MACBLOCK_LEN); - memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled"); - } } /* else the message remains empty, so TCH frames are sent */ } else { /* The +2 is empty space where the DSP inserts the L1 hdr */ @@ -834,10 +786,8 @@ rc = bts_ccch_copy_msg(trx->bts, p, &g_time, (L1SAP_FN2CCCHBLOCK(fn) < num_agch(trx, "PH-RTS-IND"))); - if (rc <= 0) { + if (rc <= 0) memcpy(p, fill_frame, GSM_MACBLOCK_LEN); - DEBUGPGT(DL1P, &g_time, "sending fill frame AGCH PCH chan_nr=%d fn=%u\n", chan_nr, fn); - } } DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id); @@ -1486,7 +1436,6 @@ char name[32]; snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr); - LOGP(DL1C, LOGL_NOTICE, "allocating DTX FSM for chan_nr=%d\n", chan_nr); lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm, tall_bts_ctx, lchan, -- To view, visit https://gerrit.osmocom.org/10573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd8c0899451ae3c17bc07d4e112e32b4897405c9 Gerrit-Change-Number: 10573 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:37:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 12:37:19 +0000 Subject: Change in libosmo-abis[master]: ipaccess_rcvmsg: Fix bug introduced in previous commit Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10574 Change subject: ipaccess_rcvmsg: Fix bug introduced in previous commit ...................................................................... ipaccess_rcvmsg: Fix bug introduced in previous commit Commit 56ae85fd524d5c9e8b61ccb19e81b16fbc726bb0 modified code in ipaccess_rcvmsg to use osmo_fd_setup. During this change, a "|=" operator was converted to "=". Fix this change by manually ORing old and new values passed to osmo_fd_setup. Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76 --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/74/10574/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 6f41c97..ac61e14 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -190,7 +190,7 @@ /* get rid of our old temporary bfd */ /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ - osmo_fd_setup(newbfd, bfd->fd, bfd->when, bfd->cb, + osmo_fd_setup(newbfd, bfd->fd, newbfd->when | bfd->when, bfd->cb, bfd->data, E1INP_SIGN_RSL + unit_data.trx_id); osmo_fd_unregister(bfd); bfd->fd = -1; -- To view, visit https://gerrit.osmocom.org/10574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76 Gerrit-Change-Number: 10574 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:48:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 12:48:07 +0000 Subject: Change in libosmo-abis[master]: ipaccess_rcvmsg: Fix bug introduced in previous commit In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10574 ) Change subject: ipaccess_rcvmsg: Fix bug introduced in previous commit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76 Gerrit-Change-Number: 10574 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 23 Aug 2018 12:48:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:48:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 12:48:09 +0000 Subject: Change in libosmo-abis[master]: ipaccess_rcvmsg: Fix bug introduced in previous commit In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10574 ) Change subject: ipaccess_rcvmsg: Fix bug introduced in previous commit ...................................................................... ipaccess_rcvmsg: Fix bug introduced in previous commit Commit 56ae85fd524d5c9e8b61ccb19e81b16fbc726bb0 modified code in ipaccess_rcvmsg to use osmo_fd_setup. During this change, a "|=" operator was converted to "=". Fix this change by manually ORing old and new values passed to osmo_fd_setup. Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76 --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 6f41c97..ac61e14 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -190,7 +190,7 @@ /* get rid of our old temporary bfd */ /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ - osmo_fd_setup(newbfd, bfd->fd, bfd->when, bfd->cb, + osmo_fd_setup(newbfd, bfd->fd, newbfd->when | bfd->when, bfd->cb, bfd->data, E1INP_SIGN_RSL + unit_data.trx_id); osmo_fd_unregister(bfd); bfd->fd = -1; -- To view, visit https://gerrit.osmocom.org/10574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76 Gerrit-Change-Number: 10574 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:48:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 23 Aug 2018 12:48:41 +0000 Subject: Change in osmocom-bb[master]: osmocon: fix read buffer overrun in romload_prepare_block() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10575 Change subject: osmocon: fix read buffer overrun in romload_prepare_block() ...................................................................... osmocon: fix read buffer overrun in romload_prepare_block() Address sanitizer triggered when trying to chainload firmware: ==18466==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x631000027850 at pc 0x7f5b94cfb733 bp 0x7ffe33e1ae30 sp 0x7ffe33e1a5d8 READ of size 1014 at 0x631000027850 thread T0 #0 0x7f5b94cfb732 (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x79732) #1 0x563db4293e6e in memcpy /usr/include/x86_64-linux-gnu/bits/string_fortified.h:34 #2 0x563db4293e6e in romload_prepare_block osmocom-bb/src/host/osmocon/osmocon.c:473 #3 0x563db429541f in handle_read_romload osmocom-bb/src/host/osmocon/osmocon.c:959 #4 0x563db429541f in serial_read osmocom-bb/src/host/osmocon/osmocon.c:1168 #5 0x7f5b94722c83 in osmo_fd_disp_fds libosmocore/src/select.c:217 #6 0x7f5b94722f84 in osmo_select_main libosmocore/src/select.c:257 #7 0x563db4293b1c in main osmocom-bb/src/host/osmocon/osmocon.c:1525 #8 0x7f5b942b9b96 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b96) #9 0x563db4293c79 in _start (prefix/sbin/osmocon+0x1c79) 0x631000027850 is located 0 bytes to the right of 77904-byte region [0x631000014800,0x631000027850) allocated by thread T0 here: #0 0x7f5b94d60b50 in __interceptor_malloc (/usr/lib/x86_64-linux-gnu/libasan.so.4+0xdeb50) #1 0x563db4294d65 in read_file osmocom-bb/src/host/osmocon/osmocon.c:314 Change-Id: Ie2955e11dd1af75574536774ef7ddf88ddf1fe8b --- M src/host/osmocon/osmocon.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/75/10575/1 diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index 131eab7..c264556 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -470,7 +470,7 @@ remaining_bytes = dnload.data_len - 3 - (dnload.block_payload_size * dnload.block_number); - memcpy(block_data, dnload.write_ptr, dnload.block_payload_size); + memcpy(block_data, dnload.write_ptr, OSMO_MIN(dnload.block_payload_size, remaining_bytes)); if (remaining_bytes <= dnload.block_payload_size) { fill_bytes = (dnload.block_payload_size - remaining_bytes); -- To view, visit https://gerrit.osmocom.org/10575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2955e11dd1af75574536774ef7ddf88ddf1fe8b Gerrit-Change-Number: 10575 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:50:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 23 Aug 2018 12:50:26 +0000 Subject: Change in libosmo-abis[master]: ipaccess_rcvmsg: Fix bug introduced in previous commit In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10574 ) Change subject: ipaccess_rcvmsg: Fix bug introduced in previous commit ...................................................................... Patch Set 1: Verified+1 Code-Review+2 hey, not so fast. I want to +2 first. -- To view, visit https://gerrit.osmocom.org/10574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76 Gerrit-Change-Number: 10574 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 23 Aug 2018 12:50:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 12:54:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 23 Aug 2018 12:54:32 +0000 Subject: Change in osmocom-bb[master]: osmocon: fix use of an initialized variable Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10576 Change subject: osmocon: fix use of an initialized variable ...................................................................... osmocon: fix use of an initialized variable osmocon.c: In function ?read_file?: osmocon.c:317:3: warning: ?fd? may be used uninitialized in this function Change-Id: If07c58d5b55c18c05345607064eace02748935f8 --- M src/host/osmocon/osmocon.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/76/10576/1 diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index 131eab7..a9497dc 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -314,7 +314,8 @@ dnload.data = malloc(MAX_HDR_SIZE + payload_size); if (!dnload.data) { - close(fd); + if (!chainload) + close(fd); fprintf(stderr, "No memory\n"); return -ENOMEM; } -- To view, visit https://gerrit.osmocom.org/10576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If07c58d5b55c18c05345607064eace02748935f8 Gerrit-Change-Number: 10576 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 13:54:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 23 Aug 2018 13:54:11 +0000 Subject: Change in osmo-msc[master]: cosmetic: mute "COMPLETE_LAYER_3 not permitted" Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10577 Change subject: cosmetic: mute "COMPLETE_LAYER_3 not permitted" ...................................................................... cosmetic: mute "COMPLETE_LAYER_3 not permitted" For networks without Authentication, the conn is already accepted when SUBSCR_CONN_E_COMPLETE_LAYER_3 is emitted. Mute that misleading error message. All is actually fine. Adjust expected test logs. Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402 --- M src/libmsc/subscr_conn.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_ss.err 4 files changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/10577/1 diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index c1d0e11..2040e36 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -218,6 +218,12 @@ static void subscr_conn_fsm_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { + case SUBSCR_CONN_E_COMPLETE_LAYER_3: + /* When Authentication is off, we may already be in the Accepted state when the code + * evaluates the Compl L3. Simply ignore. This just cosmetically mutes the error log + * about the useless event. */ + return; + case SUBSCR_CONN_E_COMMUNICATING: osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_COMMUNICATING, 0, 0); return; @@ -363,7 +369,8 @@ [SUBSCR_CONN_S_ACCEPTED] = { .name = OSMO_STRINGIFY(SUBSCR_CONN_S_ACCEPTED), /* allow everything to release for any odd behavior */ - .in_event_mask = S(SUBSCR_CONN_E_COMMUNICATING) | + .in_event_mask = S(SUBSCR_CONN_E_COMPLETE_LAYER_3) | + S(SUBSCR_CONN_E_COMMUNICATING) | S(SUBSCR_CONN_E_RELEASE_WHEN_UNUSED) | S(SUBSCR_CONN_E_ACCEPTED) | S(SUBSCR_CONN_E_MO_CLOSE) | diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 0a36094..f2453af 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -155,7 +155,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -238,7 +237,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 @@ -516,7 +514,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -599,7 +596,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 39199ef..84436d3 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -702,7 +702,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -900,7 +899,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -1101,7 +1099,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -1309,7 +1306,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 @@ -1537,7 +1533,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 @@ -1785,7 +1780,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 338b5aa..7255e7d 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -148,7 +148,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -384,7 +383,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: NCSS DREF VLR subscr MSISDN:46071 usage decreases to: 3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x40: trans_nc_ss) dtap_tx_confirmed == 1 paging_stopped == 1 -- To view, visit https://gerrit.osmocom.org/10577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402 Gerrit-Change-Number: 10577 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 14:45:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 14:45:12 +0000 Subject: Change in osmo-bsc[master]: Fix heap-use-after-free due to OML link destruction Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10578 Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Fix heap-use-after-free due to OML link destruction Fixes: OS#3495 Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/ipaccess.h M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/osmo_bsc_main.c 4 files changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/10578/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index f85887a..b827d0a 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -923,6 +923,8 @@ struct gsm_e1_subslot oml_e1_link; uint8_t oml_tei; struct e1inp_sign_link *oml_link; + /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ + struct osmo_timer_list oml_drop_link_timer; /* when OML link was established */ time_t uptime; diff --git a/include/osmocom/bsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h index 3d0f612..692e795 100644 --- a/include/osmocom/bsc/ipaccess.h +++ b/include/osmocom/bsc/ipaccess.h @@ -31,6 +31,7 @@ } __attribute__((packed)); void ipaccess_drop_oml(struct gsm_bts *bts); +void ipaccess_drop_oml_deferred(struct gsm_bts *bts); void ipaccess_drop_rsl(struct gsm_bts_trx *trx); struct sdp_header_item { diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 80f7c9c..fec4147 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -166,7 +166,7 @@ enum abis_nm_chan_comb ccomb = abis_nm_chcomb4pchan(ts->pchan_from_config); if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - ipaccess_drop_oml(trx->bts); + ipaccess_drop_oml_deferred(trx->bts); return -1; } abis_nm_chg_adm_state(trx->bts, obj_class, @@ -400,6 +400,9 @@ struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; + /* First of all, remove deferred drop if enabled */ + osmo_timer_del(&bts->oml_drop_link_timer); + if (!bts->oml_link) return; @@ -432,6 +435,29 @@ } } +/*! Callback for \ref ipaccess_drop_oml_deferred_cb. + */ +static void ipaccess_drop_oml_deferred_cb(void *data) +{ + struct gsm_bts *bts = (struct gsm_bts *) data; + ipaccess_drop_oml(bts); +} +/*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in + * current code context. This may be needed if we want to destroy the OML link + * while being called from a lower layer "struct osmo_fd" cb, were it is + * mandatory to return -EBADF if the osmo_fd has been destroyed. In case code + * destroying an OML link is called through an osmo_signal, it becomes + * impossible to return any value, thus deferring the destruction is required. + */ +void ipaccess_drop_oml_deferred(struct gsm_bts *bts) +{ + if (!osmo_timer_pending(&bts->oml_drop_link_timer) && bts->oml_link) { + LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Deferring Drop of OML link.\n", bts->nr); + osmo_timer_setup(&bts->oml_drop_link_timer, ipaccess_drop_oml_deferred_cb, bts); + osmo_timer_schedule(&bts->oml_drop_link_timer, 0, 0); + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 8ff0e8a..0dbe81c 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -191,7 +191,7 @@ } if (is_ipaccess_bts(nack->bts)) - ipaccess_drop_oml(nack->bts); + ipaccess_drop_oml_deferred(nack->bts); return 0; } -- To view, visit https://gerrit.osmocom.org/10578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c Gerrit-Change-Number: 10578 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 14:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 14:50:35 +0000 Subject: Change in osmo-bsc[master]: Fix heap-use-after-free due to OML link destruction In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10578 ) Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Fix heap-use-after-free due to OML link destruction ipaccess_drop_oml was being called inside an osmo_fd cb context, were -EBADF must be returned if the structure holding the osmo_fd is freed. In the middle of the path (see OS#3495 for path tree) it goes through a signal dispatch, so it's impossible to make sure we return some value to the osmo_fd cb. As a result, it is required to defer dropping the OML Link from current code path and do it through a timer. Fixes following ASan report: 20180822124927913 <0004> abis_nm.c:787 OC=RADIO-CARRIER(02) INST=(00,00,ff): CHANGE ADMINISTRATIVE STATE NACK CAUSE=Message cannot be performed 20180822124927913 <0004> osmo_bsc_main.c:186 Got CHANGE ADMINISTRATIVE STATE NACK going to drop the OML links. 20180822124927913 <0015> bts_ipaccess_nanobts.c:406 (bts=0) Dropping OML link. ... ================================================================= ==17607==ERROR: AddressSanitizer: heap-use-after-free on address 0x62e000060a68 at pc 0x7f5ea8e27086 bp 0x7ffde92b6d80 sp 0x7ffde92b6d78 READ of size 8 at 0x62e000060a68 thread T0 #0 0x7f5ea8e27085 in handle_ts1_write input/ipaccess.c:371 #1 0x7f5ea8e27085 in ipaccess_fd_cb input/ipaccess.c:391 #2 0x7f5ea9147ca8 in osmo_fd_disp_fds libosmocore/src/select.c:217 #3 0x7f5ea9147ca8 in osmo_select_main libosmocore/src/select.c:257 #4 0x555813ab79d6 in main osmo-bsc/osmo_bsc_main.c:922 #5 0x7f5ea76d02e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #6 0x555813ab84e9 in _start (/bin/osmo-bsc+0x34d4e9) Fixes: OS#3495 Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/ipaccess.h M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/osmo_bsc_main.c 4 files changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/10578/2 -- To view, visit https://gerrit.osmocom.org/10578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c Gerrit-Change-Number: 10578 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Aug 23 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 23 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#224?= Message-ID: <1609743769.86.1535037006922.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:21:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 15:21:40 +0000 Subject: Change in osmo-bsc[master]: abis_nm_ipaccess_rsl_connect: Log bts and trx nr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10579 Change subject: abis_nm_ipaccess_rsl_connect: Log bts and trx nr ...................................................................... abis_nm_ipaccess_rsl_connect: Log bts and trx nr Change-Id: I0c895a44527d5396d3dabb273e000acd86aece1c --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/10579/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 1092173..4757c72 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2823,8 +2823,8 @@ if (ip == 0) attr_len -= 5; - LOGP(DNM, LOGL_INFO, "IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", - inet_ntoa(ia), port, stream); + LOGP(DNM, LOGL_INFO, "(bts=%d,trx=%d) IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", + trx->bts->nr, trx->nr, inet_ntoa(ia), port, stream); error = abis_nm_ipaccess_msg(trx->bts, NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, -- To view, visit https://gerrit.osmocom.org/10579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0c895a44527d5396d3dabb273e000acd86aece1c Gerrit-Change-Number: 10579 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:39:16 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 23 Aug 2018 15:39:16 +0000 Subject: Change in osmo-gsm-manuals[master]: Add VTY reference for osmo-sip-connector Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10580 Change subject: Add VTY reference for osmo-sip-connector ...................................................................... Add VTY reference for osmo-sip-connector Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd --- A OsmoSIPConnector/Makefile A OsmoSIPConnector/osmosipconnector-vty-reference.xml A OsmoSIPConnector/vty/sipconn_vty_additions.xml A OsmoSIPConnector/vty/sipconn_vty_reference.xml 4 files changed, 1,086 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/80/10580/1 diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile new file mode 100644 index 0000000..5a47759 --- /dev/null +++ b/OsmoSIPConnector/Makefile @@ -0,0 +1,6 @@ +TOPDIR = .. + +VTY_REFERENCE = osmosipconnector-vty-reference.xml +include $(TOPDIR)/build/Makefile.vty-reference.inc + +include $(TOPDIR)/build/Makefile.common.inc diff --git a/OsmoSIPConnector/osmosipconnector-vty-reference.xml b/OsmoSIPConnector/osmosipconnector-vty-reference.xml new file mode 100644 index 0000000..fe22a99 --- /dev/null +++ b/OsmoSIPConnector/osmosipconnector-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 21st August 2018 + dw + Initial + + + + OsmoSIPConnector VTY Reference + + + 2018 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/OsmoSIPConnector/vty/sipconn_vty_additions.xml b/OsmoSIPConnector/vty/sipconn_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/OsmoSIPConnector/vty/sipconn_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/OsmoSIPConnector/vty/sipconn_vty_reference.xml b/OsmoSIPConnector/vty/sipconn_vty_reference.xml new file mode 100644 index 0000000..35aad6b --- /dev/null +++ b/OsmoSIPConnector/vty/sipconn_vty_reference.xml @@ -0,0 +1,1040 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-log + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line + + + + + + + + + + + + + + + + + + + + config-sip + + + + + + + + + + + + + + + + + + + + + + + + config-mncc + + + + + + + + + config-app + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/10580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd Gerrit-Change-Number: 10580 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:39:16 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 23 Aug 2018 15:39:16 +0000 Subject: Change in osmo-gsm-manuals[master]: Add manual for OsmoSIPConnector Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10581 Change subject: Add manual for OsmoSIPConnector ...................................................................... Add manual for OsmoSIPConnector Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e --- M OsmoSIPConnector/Makefile A OsmoSIPConnector/chapters/configuration.adoc A OsmoSIPConnector/chapters/overview.adoc A OsmoSIPConnector/chapters/running.adoc A OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml A OsmoSIPConnector/osmosipconnector-usermanual.adoc 6 files changed, 233 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/81/10581/1 diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile index 5a47759..cd3bb89 100644 --- a/OsmoSIPConnector/Makefile +++ b/OsmoSIPConnector/Makefile @@ -1,5 +1,9 @@ TOPDIR = .. +ASCIIDOC = osmosipconnector-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(TOPDIR)/build/Makefile.asciidoc.inc + VTY_REFERENCE = osmosipconnector-vty-reference.xml include $(TOPDIR)/build/Makefile.vty-reference.inc diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc new file mode 100644 index 0000000..0a9a51f --- /dev/null +++ b/OsmoSIPConnector/chapters/configuration.adoc @@ -0,0 +1,49 @@ +== Configuring OsmoSIPConnector + +The configuration of OsmoSIPConnector consists mainly of two parts: +configuring the MNCC interface towards the MSC and configuring the SIP +interface towards the PBX. + +=== Configuring MNCC + +Configuring the MNCC interface is very simple. It has to be pointed to +the same path that OsmoMSC is also using. This means that OsmoMSC and +OsmoSIPConnector need to be running on the same machine or have a shared +directory that supports UNIX domain sockets. + +The example config below assumes that OsmoMSC was started with the command +line `osmo-msc -M /tmp/msc_mncc`. + +.Example: MNCC configuration +---- +OsmoMGW(config)# mncc +OsmoMGW(config-mncc)# socket-path /tmp/msc_mncc +---- + +=== Configuring SIP + +This section covers the SIP configuration. Source and destination IP and port +can be set for the connection to the PBX. + +.Example: SIP configuration +---- +OsmoMGW(config)# sip +OsmoMGW(config-sip)# local 10.0.0.1 5060 <1> +OsmoMGW(config-sip)# remote 10.0.0.2 5060 <2> +---- +<1> The local IP/port to use +<2> The remote SIP IP/port that the PBX uses + +There is also an option to use the IMSI as calling (source) address for +MO- and as called (destination) address for MT-calls. + +.Example: Use IMSI instead of MSISDN +---- +OsmoMGW(config)# app +OsmoMGW(config-app)# use-imsi <1> +---- +<1> Use the IMSI for MO calling and MT called address + +Since OsmoSIPConnector is just a shim between OsmoMSC and a proper SIP server +this is the extent of the configuration. Setting up a dialplan and other +SIP-related configuration should be done in the actual SIP server. diff --git a/OsmoSIPConnector/chapters/overview.adoc b/OsmoSIPConnector/chapters/overview.adoc new file mode 100644 index 0000000..24fe8b9 --- /dev/null +++ b/OsmoSIPConnector/chapters/overview.adoc @@ -0,0 +1,48 @@ +[[overview]] +== Overview + +This manual should help you getting started with OsmoSIPConnector. It will +cover aspects of configuring and running OsmoSIPConnector. + +[[intro_overview]] +=== About OsmoSIPConnector + +OsmoSIPConnector translates between Mobile Network Call Control (MNCC) +used in the GSM newtwork and Voice over IP SIP call control messages so that +speech calls can traverse through the mobile network to SIP and vice versa. It +has the following interfaces: + +- MNCC UNIX domain socket towards `osmo-msc` +- SIP towards the PBX +- The Osmocom typical telnet VTY interface. + +Find the OsmoSIPConnector issue tracker and wiki online at + +- https://osmocom.org/projects/osmo-sip-connector +- https://osmocom.org/projects/osmo-sip-connector/wiki + + +[[fig-gsm]] +.Typical GSM network architecture used with OsmoSIPConnector +[graphviz] +---- +digraph G{ + rankdir = LR; + "osmo-sip-connector" [color="red"]; + OsmoMGWB [label="OsmoMGW\n(BSC)"]; + OsmoMGWM [label="OsmoMGW\n(MSC)"]; + MS -> BTS [label = "Um"]; + BTS -> OsmoBSC [label = "Abis"]; + OsmoBSC -> OsmoMSC [label = "AoIP" ]; + OsmoMSC -> "osmo-sip-connector" [label = "MNCC"]; + "osmo-sip-connector" -> "PBX" [label = "SIP"]; + BTS -> OsmoMGWB [label = "RTP"]; + OsmoMGWB -> OsmoMGWM [label = "RTP"]; + OsmoMGWM -> "PBX" [label = "RTP"]; + OsmoBSC -> OsmoMGWB [label = "MGCP" ]; + OsmoMSC -> OsmoMGWM [label = "MGCP" ]; + { rank = same; OsmoBSC; OsmoMGWB; } + { rank = same; OsmoMSC; OsmoMGWM; } +} +---- + diff --git a/OsmoSIPConnector/chapters/running.adoc b/OsmoSIPConnector/chapters/running.adoc new file mode 100644 index 0000000..5e0d583 --- /dev/null +++ b/OsmoSIPConnector/chapters/running.adoc @@ -0,0 +1,58 @@ +== Running OsmoSIPConnectoer + +The OsmoSIPConnector executable (`osmo-sip-connector`) offers the following +command-line arguments: + +=== SYNOPSIS + +*osmo-sip-connector* [-h] [-c 'CONFIGFILE'] + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-sip-connector.cfg` in the + current working directory. + +=== Colocation with OsmoMSC + +Since the MNCC interface used to communicate between OsmoMSC and +OsmoSIPConnector is a UNIX domain socket both processes must run on the same +machine or have a shared directory that supports sharing UNIX domain sockets. + +=== Multiple instances + +Running multiple instances of `osmo-sip-connector` on the same computer is +possible if all interfaces (VTY, CTRL) are separated using the appropriate +configuration options. The IP based interfaces are binding to local host by +default. In order to separate the processes, the user has to bind those +services to specific but different IP addresses and/or ports. + +The VTY and the Control interface can be bound to IP addresses from the +loopback address range, for example: + +---- +line vty + bind 127.0.0.2 +ctrl + bind 127.0.0.2 +---- + +For the SIP client a different IP/port combination also needs to be used, for +example: + +---- +sip + local 0.0.0.0 5061 +---- + +The socket path for the MNCC interface also needs to change, which can be done +with the following configuration snippet: + +---- +mncc + socket-path /tmp/msc2_mncc +---- + diff --git a/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml b/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml new file mode 100644 index 0000000..937e054 --- /dev/null +++ b/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml @@ -0,0 +1,46 @@ + + + 1 + August 04th, 2018 + DW + + Initial version + + + + + + + Daniel + Willmann + dwillmann at sysmocom.de + DW + + sysmocom + sysmocom - s.f.m.c. GmbH + + + + + + 2018 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc new file mode 100644 index 0000000..72f6c1f --- /dev/null +++ b/OsmoSIPConnector/osmosipconnector-usermanual.adoc @@ -0,0 +1,28 @@ +:gfdl-enabled: +:program-name: OsmoSIPConnector + +OsmoSIPConnector User Manual +============================ +Daniel Willmann + + +include::../common/chapters/preface.adoc[] + +include::chapters/overview.adoc[] + +include::chapters/running.adoc[] + +include::../common/chapters/vty.adoc[] + +include::../common/chapters/logging.adoc[] + +include::chapters/configuration.adoc[] + +include::../common/chapters/port_numbers.adoc[] + +include::../common/chapters/bibliography.adoc[] + +include::../common/chapters/glossary.adoc[] + +include::../common/chapters/gfdl.adoc[] + -- To view, visit https://gerrit.osmocom.org/10581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e Gerrit-Change-Number: 10581 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 23 Aug 2018 15:41:36 +0000 Subject: Change in osmo-gsm-manuals[master]: Add VTY reference for osmo-sip-connector In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10580 ) Change subject: Add VTY reference for osmo-sip-connector ...................................................................... Add VTY reference for osmo-sip-connector Ticket: OS#1684 Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd --- A OsmoSIPConnector/Makefile A OsmoSIPConnector/osmosipconnector-vty-reference.xml A OsmoSIPConnector/vty/sipconn_vty_additions.xml A OsmoSIPConnector/vty/sipconn_vty_reference.xml 4 files changed, 1,086 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/80/10580/2 -- To view, visit https://gerrit.osmocom.org/10580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd Gerrit-Change-Number: 10580 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 23 Aug 2018 15:41:36 +0000 Subject: Change in osmo-gsm-manuals[master]: Add manual for OsmoSIPConnector In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10581 ) Change subject: Add manual for OsmoSIPConnector ...................................................................... Add manual for OsmoSIPConnector Ticket: OS#1684 Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e --- M OsmoSIPConnector/Makefile A OsmoSIPConnector/chapters/configuration.adoc A OsmoSIPConnector/chapters/overview.adoc A OsmoSIPConnector/chapters/running.adoc A OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml A OsmoSIPConnector/osmosipconnector-usermanual.adoc 6 files changed, 233 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/81/10581/2 -- To view, visit https://gerrit.osmocom.org/10581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e Gerrit-Change-Number: 10581 Gerrit-PatchSet: 2 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:51:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 15:51:15 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce scenario modifiers In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10562 ) Change subject: Introduce scenario modifiers ...................................................................... Introduce scenario modifiers Before this patch, scenarios were only used to select resources with specific attributes. This commit introduces "modifiers" in scenarios, which allows setting or modifing config attributes of resources once they have been reserved. This way same test can be run selecting same resources but modifying its configuration, allowing for instance running different number of TRX, different timeslot configuration, etc. Modifiers are described by placing a "modifiers" dictionary in any scenario file, similar to the current "resources" one used to select requird resources. The "modifiers" dictionary is overlaid on top of the "resources" one resulting from combining all the "resources" dictionary of all scenario files. Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d --- A example/scenarios/mod-bts0-numtrx2.conf M selftest/resource_test.ok M selftest/resource_test.py M selftest/suite_test.ok M selftest/suite_test.ok.ign M selftest/suite_test.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/suite.py 8 files changed, 226 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/example/scenarios/mod-bts0-numtrx2.conf b/example/scenarios/mod-bts0-numtrx2.conf new file mode 100644 index 0000000..eb24fd3 --- /dev/null +++ b/example/scenarios/mod-bts0-numtrx2.conf @@ -0,0 +1,3 @@ +modifiers: + bts: + - num_trx: 2 diff --git a/selftest/resource_test.ok b/selftest/resource_test.ok index 884c6b3..3ec922b 100644 --- a/selftest/resource_test.ok +++ b/selftest/resource_test.ok @@ -222,6 +222,54 @@ ~~~ end: currently reserved +~~~ with modifiers: +resources(testowner)={'arfcn': [{'_hash': 'e620569450f8259b3f0212ec19c285dd07df063c', + '_reserved_by': 'testowner-123-1490837279', + 'arfcn': '512', + 'band': 'GSM-1800'}, + {'_hash': '022621e513c5a5bf33b77430a1e9c886be676fa1', + '_reserved_by': 'testowner-123-1490837279', + 'arfcn': '514', + 'band': 'GSM-1800'}], + 'bts': [{'_hash': 'd2aa7c1124943de352351b650ca0c751784da6b6', + '_reserved_by': 'testowner-123-1490837279', + 'addr': '10.42.42.114', + 'band': 'GSM-1800', + 'ciphers': ['a5_0', 'a5_1'], + 'direct_pcu': 'True', + 'ipa_unit_id': '1', + 'label': 'sysmoBTS 1002', + 'type': 'osmo-bts-sysmo'}, + {'_hash': '6a9c9fbd364e1563a5b9f0826030a7888fd19575', + '_reserved_by': 'testowner-123-1490837279', + 'addr': '10.42.42.50', + 'band': 'GSM-1800', + 'ciphers': ['a5_0', 'a5_1'], + 'ipa_unit_id': '6', + 'label': 'Ettus B200', + 'launch_trx': 'True', + 'num_trx': 2, + 'type': 'osmo-bts-trx'}], + 'ip_address': [{'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c', + '_reserved_by': 'testowner-123-1490837279', + 'addr': '10.42.42.2'}], + 'modem': [{'_hash': '0b538cb6ad799fbd7c2953fd3b4463a76c7cc9c0', + '_reserved_by': 'testowner-123-1490837279', + 'auth_algo': 'comp128v1', + 'ciphers': ['a5_0', 'a5_1'], + 'imsi': '901700000009031', + 'ki': '80A37E6FDEA931EAC92FFA5F671EFEAD', + 'label': 'sierra_1', + 'path': '/sierra_1'}, + {'_hash': '3a6e7747dfe7dfdf817bd3351031bd08051605c3', + '_reserved_by': 'testowner-123-1490837279', + 'auth_algo': 'comp128v1', + 'ciphers': ['a5_0', 'a5_1'], + 'imsi': '901700000009029', + 'ki': '00969E283349D354A8239E877F2E0866', + 'label': 'sierra_2', + 'path': '/sierra_2'}]} +~~~ end: with modifiers: ~~~ currently reserved: {} diff --git a/selftest/resource_test.py b/selftest/resource_test.py index 52d8e47..cdfe021 100755 --- a/selftest/resource_test.py +++ b/selftest/resource_test.py @@ -77,16 +77,22 @@ 'arfcn': [ { 'band': 'GSM-1800', 'times': 2 } ], 'modem': [ { 'times': 2 , 'ciphers': ['a5_0', 'a5_1']} ], } - +modifiers = { + 'bts': [ {}, {'num_trx': 2 }], +} origin = log.Origin(None, 'testowner') -resources = pool.reserve(origin, config.replicate_times(want)) +resources = pool.reserve(origin, config.replicate_times(want), config.replicate_times(modifiers)) print('~~~ currently reserved:') with open(rrfile, 'r') as f: print(f.read()) print('~~~ end: currently reserved\n') +print('~~~ with modifiers:') +print(repr(resources)) +print('~~~ end: with modifiers:') + resources.free() print('~~~ currently reserved:') diff --git a/selftest/suite_test.ok b/selftest/suite_test.ok index 79c37cc..b792b57 100644 --- a/selftest/suite_test.ok +++ b/selftest/suite_test.ok @@ -34,6 +34,8 @@ tst test_suite: reserving resources in [PATH]/selftest/suite_test/test_work/state_dir ... tst test_suite: DBG: {combining='resources'} tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] +tst test_suite: DBG: {combining='modifiers'} +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] tst test_suite: Reserving 3 x bts (candidates: 6) tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 addr: 10.42.42.53 @@ -177,6 +179,9 @@ tst test_suite: DBG: {combining='resources'} [suite.py:[LINENR]] tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] [suite.py:[LINENR]] tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT] +tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]] +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] +tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 addr: 10.42.42.53 @@ -255,6 +260,9 @@ tst test_suite: DBG: {combining='resources'} [suite.py:[LINENR]] tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] [suite.py:[LINENR]] tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT] +tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]] +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] +tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 addr: 10.42.42.53 @@ -322,5 +330,128 @@ skip: test_error.py skip: test_fail.py skip: test_fail_raise.py +- test with scenario and modifiers +cnf ResourcesPool: DBG: Found config file resources.conf as [PATH]/selftest/suite_test/resources.conf in ./suite_test which is [PATH]/selftest/suite_test [config.py:[LINENR]] +cnf ResourcesPool: DBG: Found path state_dir as [PATH]/selftest/suite_test/test_work/state_dir [config.py:[LINENR]] +tst test_suite: reserving resources in [PATH]/selftest/suite_test/test_work/state_dir ... [suite.py:[LINENR]] +tst test_suite: DBG: {combining='resources'} [suite.py:[LINENR]] +tst {combining_scenarios='resources'}: DBG: {definition_conf={bts=[{'label': 'sysmoCell 5000'}, {'label': 'sysmoCell 5000'}, {'type': 'sysmo'}], ip_address=[{}], modem=[{}, {}]}} [test_suite?{combining_scenarios='resources'}] [suite.py:[LINENR]] +tst {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT] +tst test_suite: DBG: {combining='modifiers'} [suite.py:[LINENR]] +tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] +tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={bts=[{'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'type': 'sysmo'}]}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] +tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] +tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 + addr: 10.42.42.53 + band: GSM-1800 + ipa_unit_id: '7' + label: sysmoCell 5000 + trx_list: + - max_power_red: '3' + nominal_power: '10' + - max_power_red: '0' + nominal_power: '12' + trx_remote_ip: 10.42.42.112 + type: osmo-bts-trx +- _hash: 9eaa928b04ce04b19dbae972f9bfc3eea6f5e249 + addr: 10.42.42.53 + band: GSM-1800 + ipa_unit_id: '7' + label: sysmoCell 5000 + trx_list: + - nominal_power: '10' + - max_power_red: '1' + nominal_power: '12' + trx_remote_ip: 10.42.42.112 + type: osmo-bts-trx +- _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9 + addr: 10.42.42.114 + band: GSM-1800 + ipa_unit_id: '1' + label: sysmoBTS 1002 + type: sysmo + [resource.py:[LINENR]] +tst test_suite: Reserving 1 x ip_address (candidates: 3) [resource.py:[LINENR]] +tst test_suite: DBG: Picked - _hash: cde1debf28f07f94f92c761b4b7c6bf35785ced4 + addr: 10.42.42.1 + [resource.py:[LINENR]] +tst test_suite: Reserving 2 x modem (candidates: 16) [resource.py:[LINENR]] +tst test_suite: DBG: Picked - _hash: 19c69e45aa090fb511446bd00797690aa82ff52f + imsi: '901700000007801' + ki: D620F48487B1B782DA55DF6717F08FF9 + label: m7801 + path: /wavecom_0 +- _hash: e1a46516a1fb493b2617ab14fc1693a9a45ec254 + imsi: '901700000007802' + ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3 + label: m7802 + path: /wavecom_1 + [resource.py:[LINENR]] +resources(test_suite)={'bts': [{'_hash': '076ff06a4b719e61779492d3fb99f42a6635bb72', + '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', + 'addr': '10.42.42.53', + 'band': 'GSM-1800', + 'ipa_unit_id': '7', + 'label': 'sysmoCell 5000', + 'trx_list': [{'max_power_red': '3', 'nominal_power': '20'}, + {'max_power_red': '0', 'nominal_power': '20'}], + 'trx_remote_ip': '10.42.42.112', + 'type': 'osmo-bts-trx'}, + {'_hash': '9eaa928b04ce04b19dbae972f9bfc3eea6f5e249', + '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', + 'addr': '10.42.42.53', + 'band': 'GSM-1800', + 'ipa_unit_id': '7', + 'label': 'sysmoCell 5000', + 'trx_list': [{'nominal_power': '20'}, + {'max_power_red': '1', 'nominal_power': '20'}], + 'trx_remote_ip': '10.42.42.112', + 'type': 'osmo-bts-trx'}, + {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9', + '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', + 'addr': '10.42.42.114', + 'band': 'GSM-1800', + 'ipa_unit_id': '1', + 'label': 'sysmoBTS 1002', + 'type': 'sysmo'}], + 'ip_address': [{'_hash': 'cde1debf28f07f94f92c761b4b7c6bf35785ced4', + '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', + 'addr': '10.42.42.1'}], + 'modem': [{'_hash': '19c69e45aa090fb511446bd00797690aa82ff52f', + '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', + 'imsi': '901700000007801', + 'ki': 'D620F48487B1B782DA55DF6717F08FF9', + 'label': 'm7801', + 'path': '/wavecom_0'}, + {'_hash': 'e1a46516a1fb493b2617ab14fc1693a9a45ec254', + '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', + 'imsi': '901700000007802', + 'ki': '47FDB2D55CE6A10A85ABDAD034A5B7B3', + 'label': 'm7802', + 'path': '/wavecom_1'}]} + +--------------------------------------------------------------------- +trial test_suite +--------------------------------------------------------------------- + +---------------------------------------------- +trial test_suite hello_world.py +---------------------------------------------- +tst hello_world.py:[LINENR]: hello world [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: I am 'test_suite' / 'hello_world.py:[LINENR]' [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: one [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: two [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR]: three [test_suite?hello_world.py:[LINENR]] [hello_world.py:[LINENR]] +tst hello_world.py:[LINENR] Test passed (N.N sec) [test_suite?hello_world.py] [test.py:[LINENR]] +--------------------------------------------------------------------- +trial test_suite PASS +--------------------------------------------------------------------- +PASS: test_suite (pass: 1, skip: 5) + pass: hello_world.py (N.N sec) + skip: mo_mt_sms.py + skip: mo_sms.py + skip: test_error.py + skip: test_fail.py + skip: test_fail_raise.py - graceful exit. diff --git a/selftest/suite_test.ok.ign b/selftest/suite_test.ok.ign index 49bd9eb..9bd168f 100644 --- a/selftest/suite_test.ok.ign +++ b/selftest/suite_test.ok.ign @@ -2,3 +2,4 @@ \.py:[0-9]* .py:[LINENR] \([0-9.]+ sec\) (N.N sec) {combining_scenarios='resources', scenario='foo'}:.* {combining_scenarios='resources', scenario='foo'}: [RESOURCE_DICT] +test_suite-[0-9]*-[0-9]* test_suite-[ID_NUM]-[ID_NUM] diff --git a/selftest/suite_test.py b/selftest/suite_test.py index a8b0f37..db19ccc 100755 --- a/selftest/suite_test.py +++ b/selftest/suite_test.py @@ -58,5 +58,16 @@ results = s.run_tests('hello_world.py') print(report.suite_to_text(s)) +print('- test with scenario and modifiers') +trial = log.Origin(log.C_TST, 'trial') +scenario = config.Scenario('foo', 'bar') +scenario['resources'] = { 'bts': [{ 'times': '2', 'type': 'osmo-bts-trx', 'trx_list': [{'nominal_power': '10'}, {'nominal_power': '12'}]}, {'type': 'sysmo'}] } +scenario['modifiers'] = { 'bts': [{ 'times': '2', 'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'type': 'sysmo'}] } +s = suite.SuiteRun(trial, 'test_suite', s_def, [scenario]) +s.reserve_resources() +print(repr(s.reserved_resources)) +results = s.run_tests('hello_world.py') +print(report.suite_to_text(s)) + print('\n- graceful exit.') # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index dca8090..5204b61 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -87,7 +87,8 @@ CONF_SCHEMA = util.dict_add( { 'defaults.timeout': schema.STR }, - dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()])) + dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()]), + dict([('modifiers.%s' % key, val) for key, val in WANT_SCHEMA.items()])) KNOWN_BTS_TYPES = { 'osmo-bts-sysmo': bts_sysmo.SysmoBts, @@ -113,7 +114,7 @@ self.all_resources = Resources(config.read(self.config_path, RESOURCES_SCHEMA)) self.all_resources.set_hashes() - def reserve(self, origin, want): + def reserve(self, origin, want, modifiers): ''' attempt to reserve the resources specified in the dict 'want' for 'origin'. Obtain a lock on the resources lock dir, verify that all @@ -125,7 +126,11 @@ 'origin' should be an Origin() instance. - 'want' is a dict matching RESOURCES_SCHEMA. + 'want' is a dict matching RESOURCES_SCHEMA, used to specify what to + reserve. + + 'modifiers' is a dict matching RESOURCES_SCHEMA, it is overlaid on top + of 'want'. If an entry has no attribute set, any of the resources may be reserved without further limitations. @@ -142,6 +147,7 @@ } ''' schema.validate(want, RESOURCES_SCHEMA) + schema.validate(modifiers, RESOURCES_SCHEMA) origin_id = origin.origin_id() @@ -156,7 +162,7 @@ config.write(rrfile_path, reserved) self.remember_to_free(to_be_reserved) - return ReservedResources(self, origin, to_be_reserved) + return ReservedResources(self, origin, to_be_reserved, modifiers) def free(self, origin, to_be_freed): log.ctx(origin) @@ -491,10 +497,12 @@ dependencies from so far unused (but reserved) resource. ''' - def __init__(self, resources_pool, origin, reserved): + def __init__(self, resources_pool, origin, reserved, modifiers): self.resources_pool = resources_pool self.origin = origin - self.reserved = reserved + self.reserved_original = reserved + self.reserved = copy.deepcopy(self.reserved_original) + config.overlay(self.reserved, modifiers) def __repr__(self): return 'resources(%s)=%s' % (self.origin.name(), pprint.pformat(self.reserved)) @@ -551,9 +559,9 @@ item.pop(USED_KEY, None) def free(self): - if self.reserved: - self.resources_pool.free(self.origin, self.reserved) - self.reserved = None + if self.reserved_original: + self.resources_pool.free(self.origin, self.reserved_original) + self.reserved_original = None def counts(self): counts = {} diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index c712a75..fa86f96 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -71,6 +71,7 @@ self.objects_to_clean_up = None self.test_import_modules_to_clean_up = [] self._resource_requirements = None + self._resource_modifiers = None self._config = None self._processes = None self._run_dir = None @@ -154,6 +155,11 @@ self._resource_requirements = self.combined('resources') return self._resource_requirements + def resource_modifiers(self): + if self._resource_modifiers is None: + self._resource_modifiers = self.combined('modifiers') + return self._resource_modifiers + def config(self): if self._config is None: self._config = self.combined('config') @@ -163,7 +169,7 @@ if self.reserved_resources: raise RuntimeError('Attempt to reserve resources twice for a SuiteRun') self.log('reserving resources in', self.resources_pool.state_dir, '...') - self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements()) + self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements(), self.resource_modifiers()) def run_tests(self, names=None): suite_libdir = os.path.join(self.definition.suite_dir, 'lib') -- To view, visit https://gerrit.osmocom.org/10562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If8c422c67d9a971d9ce2c72594f55cde2db7550d Gerrit-Change-Number: 10562 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:51:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 15:51:16 +0000 Subject: Change in osmo-gsm-tester[master]: Replace suites dyn_ts_ipa* and voice using scenario modifiers In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10563 ) Change subject: Replace suites dyn_ts_ipa* and voice using scenario modifiers ...................................................................... Replace suites dyn_ts_ipa* and voice using scenario modifiers Now that we support modifiers in scenario files, we don't need to duplicate tests and testsuites to dynamically set trx configuration at run time. It can be done more easily with scenario modifiers. Change-Id: I80c441bb5b98d5d2e95d4c6ae1efab3e5f3c40d9 --- M example/default-suites.conf A example/scenarios/mod-bts0-dynts-ipa.conf A example/scenarios/mod-bts0-dynts-osmo.conf A example/scenarios/mod-bts0-ts-tchf.conf A example/scenarios/mod-bts0-ts-tchh.conf D suites/dyn_ts_ipa/lib/testlib.py D suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py D suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py D suites/dyn_ts_ipa/suite.conf D suites/dyn_ts_osmo/lib/testlib.py D suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py D suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py D suites/dyn_ts_osmo/suite.conf D suites/voice/lib/testlib.py A suites/voice/mo_mt_call.py D suites/voice/mo_mt_call_tchf.py D suites/voice/mo_mt_call_tchh.py 17 files changed, 136 insertions(+), 278 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/example/default-suites.conf b/example/default-suites.conf index fa95daa..7ff8470 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -2,45 +2,59 @@ - aoip_sms:sysmo - ussd:sysmo - aoip_ussd:sysmo -- voice:sysmo -- dyn_ts_ipa:sysmo -- dyn_ts_osmo:sysmo +- voice:sysmo+mod-bts0-ts-tchf +- voice:sysmo+mod-bts0-ts-tchh +- voice:sysmo+mod-bts0-dynts-ipa +- voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo +- gprs:sysmo+mod-bts0-dynts-ipa +- gprs:sysmo+mod-bts0-dynts-osmo - sms:trx-b200 - aoip_sms:trx-b200 - ussd:trx-b200 - aoip_ussd:trx-b200 -- voice:trx-b200 -- dyn_ts_ipa:trx-b200 -- dyn_ts_osmo:trx-b200 +- voice:trx-b200+mod-bts0-ts-tchf +- voice:trx-b200+mod-bts0-ts-tchh +- voice:trx-b200+mod-bts0-dynts-ipa +- voice:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200 +- gprs:trx-b200+mod-bts0-dynts-ipa +- gprs:trx-b200+mod-bts0-dynts-osmo - sms:trx-sysmocell5000 - aoip_sms:trx-sysmocell5000 - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 -- voice:trx-sysmocell5000 -- dyn_ts_ipa:trx-sysmocell5000 -- dyn_ts_osmo:trx-sysmocell5000 +- voice:trx-sysmocell5000+mod-bts0-ts-tchf +- voice:trx-sysmocell5000+mod-bts0-ts-tchh +- voice:trx-sysmocell5000+mod-bts0-dynts-ipa +- voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 +- gprs:trx-sysmocell5000+mod-bts0-dynts-ipa +- gprs:trx-sysmocell5000+mod-bts0-dynts-osmo - sms:octphy - aoip_sms:octphy - ussd:octphy - aoip_ussd:octphy -- voice:octphy +- voice:octphy+mod-bts0-ts-tchf +- voice:octphy+mod-bts0-ts-tchh - gprs:octphy - sms:nanobts - aoip_sms:nanobts+band-1900 - ussd:nanobts+band-1900 - aoip_ussd:nanobts+band-1900 -- voice:nanobts+band-1900 -- dyn_ts_ipa:nanobts+band-1900 +- voice:nanobts+band-1900+mod-bts0-ts-tchf +- voice:nanobts+band-1900+mod-bts0-ts-tchh +- voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 +- gprs:nanobts+band-1900+mod-bts0-dynts-ipa - aoip_sms:nanobts+band-900 - ussd:nanobts+band-900 - aoip_ussd:nanobts+band-900 -- voice:nanobts+band-900 -- dyn_ts_ipa:nanobts+band-900 +- voice:nanobts+band-900+mod-bts0-ts-tchf +- voice:nanobts+band-900+mod-bts0-ts-tchh +- voice:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900 +- gprs:nanobts+band-900+mod-bts0-dynts-ipa - smpp - aoip_smpp - aoip_encryption diff --git a/example/scenarios/mod-bts0-dynts-ipa.conf b/example/scenarios/mod-bts0-dynts-ipa.conf new file mode 100644 index 0000000..fcad2c7 --- /dev/null +++ b/example/scenarios/mod-bts0-dynts-ipa.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' diff --git a/example/scenarios/mod-bts0-dynts-osmo.conf b/example/scenarios/mod-bts0-dynts-osmo.conf new file mode 100644 index 0000000..26345bd --- /dev/null +++ b/example/scenarios/mod-bts0-dynts-osmo.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' + - phys_chan_config: 'TCH/F_TCH/H_PDCH' diff --git a/example/scenarios/mod-bts0-ts-tchf.conf b/example/scenarios/mod-bts0-ts-tchf.conf new file mode 100644 index 0000000..527b620 --- /dev/null +++ b/example/scenarios/mod-bts0-ts-tchf.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' + - phys_chan_config: 'TCH/F' diff --git a/example/scenarios/mod-bts0-ts-tchh.conf b/example/scenarios/mod-bts0-ts-tchh.conf new file mode 100644 index 0000000..0709bc4 --- /dev/null +++ b/example/scenarios/mod-bts0-ts-tchh.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' diff --git a/suites/dyn_ts_ipa/lib/testlib.py b/suites/dyn_ts_ipa/lib/testlib.py deleted file mode 100755 index 28a4975..0000000 --- a/suites/dyn_ts_ipa/lib/testlib.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -def call_test_setup_run(bts_setup_cb=None, gprs_enable=True): - hlr = suite.hlr() - bts = suite.bts() - mgw_msc = suite.mgw() - mgw_bsc = suite.mgw() - stp = suite.stp() - msc = suite.msc(hlr, mgw_msc, stp) - bsc = suite.bsc(msc, mgw_bsc, stp) - ms_mo = suite.modem() - ms_mt = suite.modem() - - if bts_setup_cb is not None: - bts_setup_cb(bts) - - if gprs_enable: - ggsn = suite.ggsn() - sgsn = suite.sgsn(hlr, ggsn) - sgsn.bts_add(bts) - ggsn.start() - sgsn.start() - - hlr.start() - stp.start() - msc.start() - mgw_msc.start() - mgw_bsc.start() - - bsc.bts_add(bts) - bsc.start() - - bts.start() - wait(bsc.bts_is_connected, bts) - - hlr.subscriber_add(ms_mo) - hlr.subscriber_add(ms_mt) - - ms_mo.connect(msc.mcc_mnc()) - ms_mt.connect(msc.mcc_mnc()) - - ms_mo.log_info() - ms_mt.log_info() - - print('waiting for modems to attach...') - wait(ms_mo.is_connected, msc.mcc_mnc()) - wait(ms_mt.is_connected, msc.mcc_mnc()) - wait(msc.subscriber_attached, ms_mo, ms_mt) - - assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 - mo_cid = ms_mo.call_dial(ms_mt) - mt_cid = ms_mt.call_wait_incoming(ms_mo) - print('dial success') - - assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) - ms_mt.call_answer(mt_cid) - wait(ms_mo.call_is_active, mo_cid) - wait(ms_mt.call_is_active, mt_cid) - print('answer success, call established and ongoing') - - sleep(5) # maintain the call active for 5 seconds - - assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) - ms_mt.call_hangup(mt_cid) - wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) - print('hangup success') diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py deleted file mode 100755 index 4fe4e46..0000000 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 7, 'PDCH') - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py deleted file mode 100755 index c1349ae..0000000 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') - bts.set_trx_phy_channel(0, 7, 'TCH/F_PDCH') - -# Check that dynamic timeslots work fine with gprs disabled. - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) diff --git a/suites/dyn_ts_ipa/suite.conf b/suites/dyn_ts_ipa/suite.conf deleted file mode 100644 index 4ac2436..0000000 --- a/suites/dyn_ts_ipa/suite.conf +++ /dev/null @@ -1,9 +0,0 @@ -resources: - ip_address: - - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn - bts: - - times: 1 - modem: - - times: 2 - features: - - voice diff --git a/suites/dyn_ts_osmo/lib/testlib.py b/suites/dyn_ts_osmo/lib/testlib.py deleted file mode 120000 index 8f0bc5a..0000000 --- a/suites/dyn_ts_osmo/lib/testlib.py +++ /dev/null @@ -1 +0,0 @@ -../../dyn_ts_ipa/lib/testlib.py \ No newline at end of file diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py deleted file mode 100755 index b9b7935..0000000 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 7, 'PDCH') - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py deleted file mode 100755 index d80d27a..0000000 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') - bts.set_trx_phy_channel(0, 7, 'TCH/F_TCH/H_PDCH') - -# Check that dynamic timeslots work fine with gprs disabled. - -call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) diff --git a/suites/dyn_ts_osmo/suite.conf b/suites/dyn_ts_osmo/suite.conf deleted file mode 100644 index 4ac2436..0000000 --- a/suites/dyn_ts_osmo/suite.conf +++ /dev/null @@ -1,9 +0,0 @@ -resources: - ip_address: - - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn - bts: - - times: 1 - modem: - - times: 2 - features: - - voice diff --git a/suites/voice/lib/testlib.py b/suites/voice/lib/testlib.py deleted file mode 100755 index f949809..0000000 --- a/suites/voice/lib/testlib.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -def call_test_setup_run(bts_setup_cb=None): - hlr = suite.hlr() - bts = suite.bts() - mgw_msc = suite.mgw() - mgw_bsc = suite.mgw() - stp = suite.stp() - msc = suite.msc(hlr, mgw_msc, stp) - bsc = suite.bsc(msc, mgw_bsc, stp) - ms_mo = suite.modem() - ms_mt = suite.modem() - - if bts_setup_cb is not None: - bts_setup_cb(bts) - - hlr.start() - stp.start() - msc.start() - mgw_msc.start() - mgw_bsc.start() - - bsc.bts_add(bts) - bsc.start() - - bts.start() - wait(bsc.bts_is_connected, bts) - - hlr.subscriber_add(ms_mo) - hlr.subscriber_add(ms_mt) - - ms_mo.connect(msc.mcc_mnc()) - ms_mt.connect(msc.mcc_mnc()) - - ms_mo.log_info() - ms_mt.log_info() - - print('waiting for modems to attach...') - wait(ms_mo.is_connected, msc.mcc_mnc()) - wait(ms_mt.is_connected, msc.mcc_mnc()) - wait(msc.subscriber_attached, ms_mo, ms_mt) - - assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 - mo_cid = ms_mo.call_dial(ms_mt) - mt_cid = ms_mt.call_wait_incoming(ms_mo) - print('dial success') - - assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) - ms_mt.call_answer(mt_cid) - wait(ms_mo.call_is_active, mo_cid) - wait(ms_mt.call_is_active, mt_cid) - print('answer success, call established and ongoing') - - sleep(5) # maintain the call active for 5 seconds - - assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) - ms_mt.call_hangup(mt_cid) - wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) - print('hangup success') diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py new file mode 100755 index 0000000..aeda80d --- /dev/null +++ b/suites/voice/mo_mt_call.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +hlr = suite.hlr() +bts = suite.bts() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms_mo = suite.modem() +ms_mt = suite.modem() + +hlr.start() +stp.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() + +bsc.bts_add(bts) +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) + +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) + +ms_mo.connect(msc.mcc_mnc()) +ms_mt.connect(msc.mcc_mnc()) + +ms_mo.log_info() +ms_mt.log_info() + +print('waiting for modems to attach...') +wait(ms_mo.is_connected, msc.mcc_mnc()) +wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms_mo, ms_mt) + +assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 +mo_cid = ms_mo.call_dial(ms_mt) +mt_cid = ms_mt.call_wait_incoming(ms_mo) +print('dial success') + +assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) +ms_mt.call_answer(mt_cid) +wait(ms_mo.call_is_active, mo_cid) +wait(ms_mt.call_is_active, mt_cid) +print('answer success, call established and ongoing') + +sleep(5) # maintain the call active for 5 seconds + +assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) +ms_mt.call_hangup(mt_cid) +wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) +print('hangup success') diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py deleted file mode 100755 index af55dfd..0000000 --- a/suites/voice/mo_mt_call_tchf.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/F') - bts.set_trx_phy_channel(0, 3, 'TCH/F') - bts.set_trx_phy_channel(0, 4, 'TCH/F') - bts.set_trx_phy_channel(0, 5, 'TCH/F') - bts.set_trx_phy_channel(0, 6, 'TCH/F') - bts.set_trx_phy_channel(0, 7, 'TCH/F') - -call_test_setup_run(bts_setup_cb=my_bts_setup) diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py deleted file mode 100755 index 43d0760..0000000 --- a/suites/voice/mo_mt_call_tchh.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -import testlib -suite.test_import_modules_register_for_cleanup(testlib) -from testlib import call_test_setup_run - -def my_bts_setup(bts): - bts.set_num_trx(1) - bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') - bts.set_trx_phy_channel(0, 1, 'SDCCH8') - bts.set_trx_phy_channel(0, 2, 'TCH/H') - bts.set_trx_phy_channel(0, 3, 'TCH/H') - bts.set_trx_phy_channel(0, 4, 'TCH/H') - bts.set_trx_phy_channel(0, 5, 'TCH/H') - bts.set_trx_phy_channel(0, 6, 'TCH/H') - bts.set_trx_phy_channel(0, 7, 'TCH/H') - -call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/10563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I80c441bb5b98d5d2e95d4c6ae1efab3e5f3c40d9 Gerrit-Change-Number: 10563 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:51:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 15:51:17 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc, msc: Set mgw local-ip in cfg.tmpl In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10565 ) Change subject: osmo-bsc,msc: Set mgw local-ip in cfg.tmpl ...................................................................... osmo-bsc,msc: Set mgw local-ip in cfg.tmpl Change-Id: Id46aa337f12756f80d492bf3102db5b1449e2027 --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 30774cf..18303b6 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -108,6 +108,7 @@ ip.access rtp-base 25000 mgw remote-ip ${mgw.ip_address.addr} mgw remote-port 2427 + mgw local-ip ${bsc.ip_address.addr} mgw endpoint-range 1 31 codec-list hr3 amr-config 12_2k forbidden diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 76f1001..485a88b 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -24,6 +24,8 @@ routing-key 1 0.0.1 msc mgw remote-ip ${mgw.ip_address.addr} + mgw remote-port 2427 + mgw local-ip ${msc.ip_address.addr} mgw endpoint-range 1 31 mgw bts-base 8000 assign-tmsi -- To view, visit https://gerrit.osmocom.org/10565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id46aa337f12756f80d492bf3102db5b1449e2027 Gerrit-Change-Number: 10565 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:52:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 15:52:07 +0000 Subject: Change in osmo-gsm-tester[master]: Add channel_allocator cfg attr to bts resources Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10582 Change subject: Add channel_allocator cfg attr to bts resources ...................................................................... Add channel_allocator cfg attr to bts resources Change-Id: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0 --- M example/defaults.conf M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 4 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/82/10582/1 diff --git a/example/defaults.conf b/example/defaults.conf index f7bd1b1..73188d5 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -28,6 +28,7 @@ base_station_id_code: 63 stream_id: 255 osmobsc_bts_type: sysmobts + channel_allocator: ascending num_trx: 1 max_trx: 1 trx_list: diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 5204b61..e4e2f9d 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -58,6 +58,7 @@ 'bts[].launch_trx': schema.BOOL_STR, 'bts[].direct_pcu': schema.BOOL_STR, 'bts[].ciphers[]': schema.CIPHER, + 'bts[].channel_allocator': schema.CHAN_ALLOCATOR, 'bts[].num_trx': schema.UINT, 'bts[].max_trx': schema.UINT, 'bts[].trx_list[].addr': schema.IPV4, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 1473ad7..4a15bcd 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -105,6 +105,11 @@ return raise ValueError('Unknown Physical channel config: %r' % val) +def channel_allocator(val): + if val in ('ascending', 'descending'): + return + raise ValueError('Unknown Channel Allocator Policy %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -120,6 +125,7 @@ CIPHER = 'cipher' MODEM_FEATURE = 'modem_feature' PHY_CHAN = 'chan' +CHAN_ALLOCATOR = 'chan_allocator' SCHEMA_TYPES = { INT: int, @@ -137,6 +143,7 @@ CIPHER: cipher, MODEM_FEATURE: modem_feature, PHY_CHAN: phy_channel_config, + CHAN_ALLOCATOR: channel_allocator, } def validate(config, schema): diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 18303b6..edcf33f 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -49,7 +49,7 @@ ms max power 33 cell reselection hysteresis 4 rxlev access min 0 - channel allocator ascending + channel allocator ${bts.channel_allocator} rach tx integer 9 rach max transmission 7 % if bsc.net.get('rsl_ip', False): -- To view, visit https://gerrit.osmocom.org/10582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0 Gerrit-Change-Number: 10582 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 15:52:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 15:52:08 +0000 Subject: Change in osmo-gsm-tester[master]: Add testsuite + scenarios to test nanoBTS multiTRX Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10583 Change subject: Add testsuite + scenarios to test nanoBTS multiTRX ...................................................................... Add testsuite + scenarios to test nanoBTS multiTRX Currently only 2 nanoBTS in the 900 band are attached together as a multiTRX setup. We thus set num_trx to 2 and set channel allocator descending to force the BTS to use the 2nd TRX when allocating channels. Change-Id: I12e1bcb047c4efac5693cf725739e0ce2e0532ee --- M example/default-suites.conf M example/defaults.conf A example/scenarios/mod-bts0-chanallocdescend.conf 3 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/83/10583/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 7ff8470..8d692fa 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -53,8 +53,10 @@ - voice:nanobts+band-900+mod-bts0-ts-tchf - voice:nanobts+band-900+mod-bts0-ts-tchh - voice:nanobts+band-900+mod-bts0-dynts-ipa +- voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa +- gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - smpp - aoip_smpp - aoip_encryption diff --git a/example/defaults.conf b/example/defaults.conf index 73188d5..61b09fb 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -54,11 +54,22 @@ - phys_chan_config: TCH/F - phys_chan_config: TCH/F - phys_chan_config: TCH/F - - phys_chan_config: TCH/F - - phys_chan_config: TCH/F + - phys_chan_config: PDCH + - phys_chan_config: PDCH osmo_bts_octphy: max_trx: 2 nanobts: max_trx: 2 + trx_list: + - {} + - timeslot_list: + - {} + - {} + - {} + - {} + - {} + - {} + - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0. + - phys_chan_config: TCH/F diff --git a/example/scenarios/mod-bts0-chanallocdescend.conf b/example/scenarios/mod-bts0-chanallocdescend.conf new file mode 100644 index 0000000..78cd02c --- /dev/null +++ b/example/scenarios/mod-bts0-chanallocdescend.conf @@ -0,0 +1,3 @@ +modifiers: + bts: + - channel_allocator: descending -- To view, visit https://gerrit.osmocom.org/10583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I12e1bcb047c4efac5693cf725739e0ce2e0532ee Gerrit-Change-Number: 10583 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:04:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:04:32 +0000 Subject: Change in osmo-gsm-tester[master]: Add testsuite + scenarios to test nanoBTS multiTRX In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10583 ) Change subject: Add testsuite + scenarios to test nanoBTS multiTRX ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I12e1bcb047c4efac5693cf725739e0ce2e0532ee Gerrit-Change-Number: 10583 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:04:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:04:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:04:54 +0000 Subject: Change in osmo-gsm-tester[master]: Add channel_allocator cfg attr to bts resources In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10582 ) Change subject: Add channel_allocator cfg attr to bts resources ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0 Gerrit-Change-Number: 10582 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 23 Aug 2018 16:04:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:05:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 23 Aug 2018 16:05:30 +0000 Subject: Change in osmo-gsm-tester[master]: Enable 2nd TRX In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/4674 ) Change subject: Enable 2nd TRX ...................................................................... Abandoned There's a better way to do this now, see I12e1bcb047c4efac5693cf725739e0ce2e0532ee Abandoning. -- To view, visit https://gerrit.osmocom.org/4674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I7e988cb0d891c3a8da1b29a3889b5bc8edbbe1ee Gerrit-Change-Number: 4674 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:05:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:05:33 +0000 Subject: Change in osmo-gsm-manuals[master]: Add manual for OsmoSIPConnector In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10581 ) Change subject: Add manual for OsmoSIPConnector ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e Gerrit-Change-Number: 10581 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:05:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:05:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:05:36 +0000 Subject: Change in osmo-gsm-manuals[master]: Add VTY reference for osmo-sip-connector In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10580 ) Change subject: Add VTY reference for osmo-sip-connector ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd Gerrit-Change-Number: 10580 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:05:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:05:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:05:40 +0000 Subject: Change in osmo-gsm-manuals[master]: Add VTY reference for osmo-sip-connector In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10580 ) Change subject: Add VTY reference for osmo-sip-connector ...................................................................... Add VTY reference for osmo-sip-connector Ticket: OS#1684 Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd --- A OsmoSIPConnector/Makefile A OsmoSIPConnector/osmosipconnector-vty-reference.xml A OsmoSIPConnector/vty/sipconn_vty_additions.xml A OsmoSIPConnector/vty/sipconn_vty_reference.xml 4 files changed, 1,086 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile new file mode 100644 index 0000000..5a47759 --- /dev/null +++ b/OsmoSIPConnector/Makefile @@ -0,0 +1,6 @@ +TOPDIR = .. + +VTY_REFERENCE = osmosipconnector-vty-reference.xml +include $(TOPDIR)/build/Makefile.vty-reference.inc + +include $(TOPDIR)/build/Makefile.common.inc diff --git a/OsmoSIPConnector/osmosipconnector-vty-reference.xml b/OsmoSIPConnector/osmosipconnector-vty-reference.xml new file mode 100644 index 0000000..fe22a99 --- /dev/null +++ b/OsmoSIPConnector/osmosipconnector-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 21st August 2018 + dw + Initial + + + + OsmoSIPConnector VTY Reference + + + 2018 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/OsmoSIPConnector/vty/sipconn_vty_additions.xml b/OsmoSIPConnector/vty/sipconn_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/OsmoSIPConnector/vty/sipconn_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/OsmoSIPConnector/vty/sipconn_vty_reference.xml b/OsmoSIPConnector/vty/sipconn_vty_reference.xml new file mode 100644 index 0000000..35aad6b --- /dev/null +++ b/OsmoSIPConnector/vty/sipconn_vty_reference.xml @@ -0,0 +1,1040 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-log + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line + + + + + + + + + + + + + + + + + + + + config-sip + + + + + + + + + + + + + + + + + + + + + + + + config-mncc + + + + + + + + + config-app + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/10580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd Gerrit-Change-Number: 10580 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:05:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:05:40 +0000 Subject: Change in osmo-gsm-manuals[master]: Add manual for OsmoSIPConnector In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10581 ) Change subject: Add manual for OsmoSIPConnector ...................................................................... Add manual for OsmoSIPConnector Ticket: OS#1684 Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e --- M OsmoSIPConnector/Makefile A OsmoSIPConnector/chapters/configuration.adoc A OsmoSIPConnector/chapters/overview.adoc A OsmoSIPConnector/chapters/running.adoc A OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml A OsmoSIPConnector/osmosipconnector-usermanual.adoc 6 files changed, 233 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile index 5a47759..cd3bb89 100644 --- a/OsmoSIPConnector/Makefile +++ b/OsmoSIPConnector/Makefile @@ -1,5 +1,9 @@ TOPDIR = .. +ASCIIDOC = osmosipconnector-usermanual.adoc +ASCIIDOC_DEPS = chapters/*.adoc +include $(TOPDIR)/build/Makefile.asciidoc.inc + VTY_REFERENCE = osmosipconnector-vty-reference.xml include $(TOPDIR)/build/Makefile.vty-reference.inc diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc new file mode 100644 index 0000000..0a9a51f --- /dev/null +++ b/OsmoSIPConnector/chapters/configuration.adoc @@ -0,0 +1,49 @@ +== Configuring OsmoSIPConnector + +The configuration of OsmoSIPConnector consists mainly of two parts: +configuring the MNCC interface towards the MSC and configuring the SIP +interface towards the PBX. + +=== Configuring MNCC + +Configuring the MNCC interface is very simple. It has to be pointed to +the same path that OsmoMSC is also using. This means that OsmoMSC and +OsmoSIPConnector need to be running on the same machine or have a shared +directory that supports UNIX domain sockets. + +The example config below assumes that OsmoMSC was started with the command +line `osmo-msc -M /tmp/msc_mncc`. + +.Example: MNCC configuration +---- +OsmoMGW(config)# mncc +OsmoMGW(config-mncc)# socket-path /tmp/msc_mncc +---- + +=== Configuring SIP + +This section covers the SIP configuration. Source and destination IP and port +can be set for the connection to the PBX. + +.Example: SIP configuration +---- +OsmoMGW(config)# sip +OsmoMGW(config-sip)# local 10.0.0.1 5060 <1> +OsmoMGW(config-sip)# remote 10.0.0.2 5060 <2> +---- +<1> The local IP/port to use +<2> The remote SIP IP/port that the PBX uses + +There is also an option to use the IMSI as calling (source) address for +MO- and as called (destination) address for MT-calls. + +.Example: Use IMSI instead of MSISDN +---- +OsmoMGW(config)# app +OsmoMGW(config-app)# use-imsi <1> +---- +<1> Use the IMSI for MO calling and MT called address + +Since OsmoSIPConnector is just a shim between OsmoMSC and a proper SIP server +this is the extent of the configuration. Setting up a dialplan and other +SIP-related configuration should be done in the actual SIP server. diff --git a/OsmoSIPConnector/chapters/overview.adoc b/OsmoSIPConnector/chapters/overview.adoc new file mode 100644 index 0000000..24fe8b9 --- /dev/null +++ b/OsmoSIPConnector/chapters/overview.adoc @@ -0,0 +1,48 @@ +[[overview]] +== Overview + +This manual should help you getting started with OsmoSIPConnector. It will +cover aspects of configuring and running OsmoSIPConnector. + +[[intro_overview]] +=== About OsmoSIPConnector + +OsmoSIPConnector translates between Mobile Network Call Control (MNCC) +used in the GSM newtwork and Voice over IP SIP call control messages so that +speech calls can traverse through the mobile network to SIP and vice versa. It +has the following interfaces: + +- MNCC UNIX domain socket towards `osmo-msc` +- SIP towards the PBX +- The Osmocom typical telnet VTY interface. + +Find the OsmoSIPConnector issue tracker and wiki online at + +- https://osmocom.org/projects/osmo-sip-connector +- https://osmocom.org/projects/osmo-sip-connector/wiki + + +[[fig-gsm]] +.Typical GSM network architecture used with OsmoSIPConnector +[graphviz] +---- +digraph G{ + rankdir = LR; + "osmo-sip-connector" [color="red"]; + OsmoMGWB [label="OsmoMGW\n(BSC)"]; + OsmoMGWM [label="OsmoMGW\n(MSC)"]; + MS -> BTS [label = "Um"]; + BTS -> OsmoBSC [label = "Abis"]; + OsmoBSC -> OsmoMSC [label = "AoIP" ]; + OsmoMSC -> "osmo-sip-connector" [label = "MNCC"]; + "osmo-sip-connector" -> "PBX" [label = "SIP"]; + BTS -> OsmoMGWB [label = "RTP"]; + OsmoMGWB -> OsmoMGWM [label = "RTP"]; + OsmoMGWM -> "PBX" [label = "RTP"]; + OsmoBSC -> OsmoMGWB [label = "MGCP" ]; + OsmoMSC -> OsmoMGWM [label = "MGCP" ]; + { rank = same; OsmoBSC; OsmoMGWB; } + { rank = same; OsmoMSC; OsmoMGWM; } +} +---- + diff --git a/OsmoSIPConnector/chapters/running.adoc b/OsmoSIPConnector/chapters/running.adoc new file mode 100644 index 0000000..5e0d583 --- /dev/null +++ b/OsmoSIPConnector/chapters/running.adoc @@ -0,0 +1,58 @@ +== Running OsmoSIPConnectoer + +The OsmoSIPConnector executable (`osmo-sip-connector`) offers the following +command-line arguments: + +=== SYNOPSIS + +*osmo-sip-connector* [-h] [-c 'CONFIGFILE'] + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `osmo-sip-connector.cfg` in the + current working directory. + +=== Colocation with OsmoMSC + +Since the MNCC interface used to communicate between OsmoMSC and +OsmoSIPConnector is a UNIX domain socket both processes must run on the same +machine or have a shared directory that supports sharing UNIX domain sockets. + +=== Multiple instances + +Running multiple instances of `osmo-sip-connector` on the same computer is +possible if all interfaces (VTY, CTRL) are separated using the appropriate +configuration options. The IP based interfaces are binding to local host by +default. In order to separate the processes, the user has to bind those +services to specific but different IP addresses and/or ports. + +The VTY and the Control interface can be bound to IP addresses from the +loopback address range, for example: + +---- +line vty + bind 127.0.0.2 +ctrl + bind 127.0.0.2 +---- + +For the SIP client a different IP/port combination also needs to be used, for +example: + +---- +sip + local 0.0.0.0 5061 +---- + +The socket path for the MNCC interface also needs to change, which can be done +with the following configuration snippet: + +---- +mncc + socket-path /tmp/msc2_mncc +---- + diff --git a/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml b/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml new file mode 100644 index 0000000..937e054 --- /dev/null +++ b/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml @@ -0,0 +1,46 @@ + + + 1 + August 04th, 2018 + DW + + Initial version + + + + + + + Daniel + Willmann + dwillmann at sysmocom.de + DW + + sysmocom + sysmocom - s.f.m.c. GmbH + + + + + + 2018 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc new file mode 100644 index 0000000..72f6c1f --- /dev/null +++ b/OsmoSIPConnector/osmosipconnector-usermanual.adoc @@ -0,0 +1,28 @@ +:gfdl-enabled: +:program-name: OsmoSIPConnector + +OsmoSIPConnector User Manual +============================ +Daniel Willmann + + +include::../common/chapters/preface.adoc[] + +include::chapters/overview.adoc[] + +include::chapters/running.adoc[] + +include::../common/chapters/vty.adoc[] + +include::../common/chapters/logging.adoc[] + +include::chapters/configuration.adoc[] + +include::../common/chapters/port_numbers.adoc[] + +include::../common/chapters/bibliography.adoc[] + +include::../common/chapters/glossary.adoc[] + +include::../common/chapters/gfdl.adoc[] + -- To view, visit https://gerrit.osmocom.org/10581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e Gerrit-Change-Number: 10581 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:05:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:05:53 +0000 Subject: Change in osmo-bsc[master]: abis_nm_ipaccess_rsl_connect: Log bts and trx nr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10579 ) Change subject: abis_nm_ipaccess_rsl_connect: Log bts and trx nr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c895a44527d5396d3dabb273e000acd86aece1c Gerrit-Change-Number: 10579 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:05:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:07:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:07:14 +0000 Subject: Change in osmo-msc[master]: cosmetic: mute "COMPLETE_LAYER_3 not permitted" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10577 ) Change subject: cosmetic: mute "COMPLETE_LAYER_3 not permitted" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402 Gerrit-Change-Number: 10577 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:07:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:07:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:07:15 +0000 Subject: Change in osmo-msc[master]: cosmetic: mute "COMPLETE_LAYER_3 not permitted" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10577 ) Change subject: cosmetic: mute "COMPLETE_LAYER_3 not permitted" ...................................................................... cosmetic: mute "COMPLETE_LAYER_3 not permitted" For networks without Authentication, the conn is already accepted when SUBSCR_CONN_E_COMPLETE_LAYER_3 is emitted. Mute that misleading error message. All is actually fine. Adjust expected test logs. Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402 --- M src/libmsc/subscr_conn.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_ss.err 4 files changed, 8 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index c1d0e11..2040e36 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -218,6 +218,12 @@ static void subscr_conn_fsm_accepted(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { + case SUBSCR_CONN_E_COMPLETE_LAYER_3: + /* When Authentication is off, we may already be in the Accepted state when the code + * evaluates the Compl L3. Simply ignore. This just cosmetically mutes the error log + * about the useless event. */ + return; + case SUBSCR_CONN_E_COMMUNICATING: osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_S_COMMUNICATING, 0, 0); return; @@ -363,7 +369,8 @@ [SUBSCR_CONN_S_ACCEPTED] = { .name = OSMO_STRINGIFY(SUBSCR_CONN_S_ACCEPTED), /* allow everything to release for any odd behavior */ - .in_event_mask = S(SUBSCR_CONN_E_COMMUNICATING) | + .in_event_mask = S(SUBSCR_CONN_E_COMPLETE_LAYER_3) | + S(SUBSCR_CONN_E_COMMUNICATING) | S(SUBSCR_CONN_E_RELEASE_WHEN_UNUSED) | S(SUBSCR_CONN_E_ACCEPTED) | S(SUBSCR_CONN_E_MO_CLOSE) | diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 0a36094..f2453af 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -155,7 +155,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -238,7 +237,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 @@ -516,7 +514,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -599,7 +596,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 39199ef..84436d3 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -702,7 +702,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -900,7 +899,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -1101,7 +1099,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -1309,7 +1306,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 @@ -1537,7 +1533,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 @@ -1785,7 +1780,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: SMS DREF VLR subscr MSISDN:46071 usage decreases to: 4 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x20: trans_sms) dtap_tx_confirmed == 1 paging_stopped == 1 diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 338b5aa..7255e7d 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -148,7 +148,6 @@ DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: still awaiting first request after a CM Service Request DREF VLR subscr MSISDN:46071 usage decreases to: 2 DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x8: cm_service) cm_service_result_sent == 1 msc_subscr_conn_is_accepted() == true @@ -384,7 +383,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: subscr_conn_fsm_has_active_transactions: connection still has active transaction: NCSS DREF VLR subscr MSISDN:46071 usage decreases to: 3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 -DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Event SUBSCR_CONN_E_COMPLETE_LAYER_3 not permitted DREF MSISDN:46071: MSC conn use - compl_l3 == 1 (0x40: trans_nc_ss) dtap_tx_confirmed == 1 paging_stopped == 1 -- To view, visit https://gerrit.osmocom.org/10577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2d19d0a7cf3226ee1456f75a68e007ba98232402 Gerrit-Change-Number: 10577 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:07:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:07:34 +0000 Subject: Change in pysim[master]: cards: autodetect sysmosim-gr1 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10570 ) Change subject: cards: autodetect sysmosim-gr1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec1f1ab6824ff2328baedd731b08df997df4da01 Gerrit-Change-Number: 10570 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:07:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:07:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:07:41 +0000 Subject: Change in pysim[master]: tests: add example file for sysmosim-gr1 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10572 ) Change subject: tests: add example file for sysmosim-gr1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36cfa81f9029bfaedd2e802a2d709596dbeb20ab Gerrit-Change-Number: 10572 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:07:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:08:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:08:04 +0000 Subject: Change in pysim[master]: cards: do not feed ascii as adm for sysmosim-gr1 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10571 ) Change subject: cards: do not feed ascii as adm for sysmosim-gr1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0b7cab380b89612ed3b8318e014161038335fe1b Gerrit-Change-Number: 10571 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:08:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:08:07 +0000 Subject: Change in pysim[master]: cards: autodetect sysmosim-gr1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10570 ) Change subject: cards: autodetect sysmosim-gr1 ...................................................................... cards: autodetect sysmosim-gr1 The sysmosim-gr1 lacks the auto detection feature because no autodetect is yet programmed inside the related class. - add autodetect for sysmosim-gr1 Change-Id: Iec1f1ab6824ff2328baedd731b08df997df4da01 Related: OS#3405 --- M pySim/cards.py 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index a72a52f..4dee0d8 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -387,6 +387,15 @@ """ name = 'sysmosim-gr1' + @classmethod + def autodetect(kls, scc): + try: + # Look for ATR + if scc.get_atr() == toBytes("3B 99 18 00 11 88 22 33 44 55 66 77 60"): + return kls(scc) + except: + return None + return None class SysmoUSIMgr1(Card): """ -- To view, visit https://gerrit.osmocom.org/10570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iec1f1ab6824ff2328baedd731b08df997df4da01 Gerrit-Change-Number: 10570 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:08:07 +0000 Subject: Change in pysim[master]: cards: do not feed ascii as adm for sysmosim-gr1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10571 ) Change subject: cards: do not feed ascii as adm for sysmosim-gr1 ...................................................................... cards: do not feed ascii as adm for sysmosim-gr1 When sysmosom-gr1 is used with a custom ADM key, then the ADM string is not fed through h2b() like we see it with sysmo-usim-sjs1 for example. - feed the ADM to h2b() before use Change-Id: I0b7cab380b89612ed3b8318e014161038335fe1b Related: OS#3405 --- M pySim/cards.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 4dee0d8..e294f9a 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -338,7 +338,7 @@ # Authenticate using ADM PIN 5 if p['pin_adm']: - pin = p['pin_adm'] + pin = h2b(p['pin_adm']) else: pin = h2b("4444444444444444") self._scc.verify_chv(5, pin) -- To view, visit https://gerrit.osmocom.org/10571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0b7cab380b89612ed3b8318e014161038335fe1b Gerrit-Change-Number: 10571 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:08:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:08:51 +0000 Subject: Change in osmocom-bb[master]: osmocon: fix use of an initialized variable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10576 ) Change subject: osmocon: fix use of an initialized variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If07c58d5b55c18c05345607064eace02748935f8 Gerrit-Change-Number: 10576 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 23 Aug 2018 16:08:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 16:08:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 23 Aug 2018 16:08:52 +0000 Subject: Change in osmocom-bb[master]: osmocon: fix use of an initialized variable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10576 ) Change subject: osmocon: fix use of an initialized variable ...................................................................... osmocon: fix use of an initialized variable osmocon.c: In function ?read_file?: osmocon.c:317:3: warning: ?fd? may be used uninitialized in this function Change-Id: If07c58d5b55c18c05345607064eace02748935f8 --- M src/host/osmocon/osmocon.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index 131eab7..a9497dc 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -314,7 +314,8 @@ dnload.data = malloc(MAX_HDR_SIZE + payload_size); if (!dnload.data) { - close(fd); + if (!chainload) + close(fd); fprintf(stderr, "No memory\n"); return -ENOMEM; } -- To view, visit https://gerrit.osmocom.org/10576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If07c58d5b55c18c05345607064eace02748935f8 Gerrit-Change-Number: 10576 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 17:31:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 23 Aug 2018 17:31:46 +0000 Subject: Change in osmo-mgw[master]: cosmetic: drop code dup in mgcp_client_fsm.c CRCX Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10584 Change subject: cosmetic: drop code dup in mgcp_client_fsm.c CRCX ...................................................................... cosmetic: drop code dup in mgcp_client_fsm.c CRCX Both make_crcx_msg_bind() and make_crcx_msg_bind_connect() were mostly identical. Rather, compose the CRCX bits in one common function and just add the audio bits in another. Prepares cosmetically for adding X-Osmo-IGN header. Change-Id: Ie51cc86e90ffeca5b66bcb8f6db0d389241abe57 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 19 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/84/10584/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index a0dc0fb..770db5e 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -104,48 +104,28 @@ {0, NULL} }; -static struct msgb *make_crcx_msg_bind(struct mgcp_ctx *mgcp_ctx) +static void make_crcx_msg(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info) { - struct mgcp_msg mgcp_msg; - - mgcp_msg = (struct mgcp_msg) { + *mgcp_msg = (struct mgcp_msg) { .verb = MGCP_VERB_CRCX, - .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), - .call_id = mgcp_ctx->conn_peer_local.call_id, + .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID + | MGCP_MSG_PRESENCE_CONN_MODE), + .call_id = info->call_id, .conn_mode = MGCP_CONN_RECV_ONLY, - .ptime = mgcp_ctx->conn_peer_local.ptime, - .codecs_len = mgcp_ctx->conn_peer_local.codecs_len, - .ptmap_len = mgcp_ctx->conn_peer_local.ptmap_len + .ptime = info->ptime, + .codecs_len = info->codecs_len, + .ptmap_len = info->ptmap_len }; - osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->conn_peer_local.endpoint, MGCP_ENDPOINT_MAXLEN); - memcpy(mgcp_msg.codecs, mgcp_ctx->conn_peer_local.codecs, sizeof(mgcp_msg.codecs)); - memcpy(mgcp_msg.ptmap, mgcp_ctx->conn_peer_local.ptmap, sizeof(mgcp_msg.ptmap)); - - return mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); + osmo_strlcpy(mgcp_msg->endpoint, info->endpoint, MGCP_ENDPOINT_MAXLEN); + memcpy(mgcp_msg->codecs, info->codecs, sizeof(mgcp_msg->codecs)); + memcpy(mgcp_msg->ptmap, info->ptmap, sizeof(mgcp_msg->ptmap)); } -static struct msgb *make_crcx_msg_bind_connect(struct mgcp_ctx *mgcp_ctx) +static void add_audio(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info) { - struct mgcp_msg mgcp_msg; - - mgcp_msg = (struct mgcp_msg) { - .verb = MGCP_VERB_CRCX, - .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | - MGCP_MSG_PRESENCE_CONN_MODE | MGCP_MSG_PRESENCE_AUDIO_IP | - MGCP_MSG_PRESENCE_AUDIO_PORT), - .call_id = mgcp_ctx->conn_peer_local.call_id, - .conn_mode = MGCP_CONN_RECV_SEND, - .audio_ip = mgcp_ctx->conn_peer_local.addr, - .audio_port = mgcp_ctx->conn_peer_local.port, - .ptime = mgcp_ctx->conn_peer_local.ptime, - .codecs_len = mgcp_ctx->conn_peer_local.codecs_len, - .ptmap_len = mgcp_ctx->conn_peer_local.ptmap_len - }; - osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->conn_peer_local.endpoint, MGCP_ENDPOINT_MAXLEN); - memcpy(mgcp_msg.codecs, mgcp_ctx->conn_peer_local.codecs, sizeof(mgcp_msg.codecs)); - memcpy(mgcp_msg.ptmap, mgcp_ctx->conn_peer_local.ptmap, sizeof(mgcp_msg.ptmap)); - - return mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); + mgcp_msg->presence |= MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT; + mgcp_msg->audio_ip = info->addr; + mgcp_msg->audio_port = info->port; } static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx) @@ -197,6 +177,7 @@ { struct mgcp_ctx *mgcp_ctx = data; struct mgcp_client *mgcp; + struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; @@ -209,10 +190,10 @@ LOGPFSML(fi, LOGL_DEBUG, "MGW/CRCX: creating connection on MGW endpoint:%s...\n", mgcp_ctx->conn_peer_local.endpoint); + make_crcx_msg(&mgcp_msg, &mgcp_ctx->conn_peer_local); if (mgcp_ctx->conn_peer_local.port) - msg = make_crcx_msg_bind_connect(mgcp_ctx); - else - msg = make_crcx_msg_bind(mgcp_ctx); + add_audio(&mgcp_msg, &mgcp_ctx->conn_peer_local); + msg = mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); OSMO_ASSERT(msg); mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg); -- To view, visit https://gerrit.osmocom.org/10584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie51cc86e90ffeca5b66bcb8f6db0d389241abe57 Gerrit-Change-Number: 10584 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 17:31:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 23 Aug 2018 17:31:47 +0000 Subject: Change in osmo-mgw[master]: add X-Osmo-IGN MGCP header to ignore CallID Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10585 Change subject: add X-Osmo-IGN MGCP header to ignore CallID ...................................................................... add X-Osmo-IGN MGCP header to ignore CallID The format is CRCX ... C: ... M: ... X-Osmo-IGN: C So far the only ignorable element is C, i.e. the CallID. Any other items may be added in the future. (I initially intended to also add '@' to ignore the endpoint name's domain part, but in the osmo-mgw code base the domain part is verified long before any additional headers are even parsed, so sparing that refactoring for now.) The intention is that osmo-bsc will issue "X-Osmo-IGN: C" for all SCCPlite calls, because we are unable to retrieve the CallID that the MSC sends to osmo-mgw for the network side of the endpoint. Testing with a specific SCCPlite MSC, I actually observe that all CallIDs are 1, even for concurrent calls. So, an alternative hacky solution would have been to always pass CallID == 1 for SCCPlite connections from osmo-bsc. Related: I257ad574d8060fef19afce9798bd8a5a7f8c99fe (osmo-bsc) Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 --- M include/osmocom/mgcp/mgcp_common.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c M src/libosmo-mgcp-client/mgcp_client_vty.c M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 13 files changed, 132 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/85/10585/1 diff --git a/include/osmocom/mgcp/mgcp_common.h b/include/osmocom/mgcp/mgcp_common.h index eb6564f..b2c7370 100644 --- a/include/osmocom/mgcp/mgcp_common.h +++ b/include/osmocom/mgcp/mgcp_common.h @@ -49,6 +49,14 @@ MGCP_CONN_LOOPBACK = 4 | MGCP_CONN_RECV_SEND, }; +#define MGCP_X_OSMO_IGN_HEADER "X-Osmo-IGN:" + +/* Values should be bitwise-OR-able */ +enum mgcp_x_osmo_ign { + MGCP_X_OSMO_IGN_NONE = 0, + MGCP_X_OSMO_IGN_CALLID = 1, +}; + /* Ensure that the msg->l2h is NUL terminated. */ static inline int mgcp_msg_terminate_nul(struct msgb *msg) { diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 3876794..d834c09 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -90,6 +90,9 @@ /*! Memorize if this endpoint was choosen by the MGW (wildcarded, true) * or if the user has choosen the particular endpoint explicitly. */ bool wildcarded_req; + + /*! MGCP_X_OSMO_IGN_* flags from 'X-Osmo-IGN:' header */ + uint32_t x_osmo_ign; }; /*! Extract endpoint number for a given endpoint */ diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index ed2dfb0..6c478e8 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -11,6 +11,8 @@ #define MGCP_CLIENT_REMOTE_ADDR_DEFAULT "127.0.0.1" #define MGCP_CLIENT_REMOTE_PORT_DEFAULT 2427 +#define MGCP_CLIENT_MGW_STR "Configure MGCP connection to Media Gateway\n" + struct msgb; struct vty; struct mgcp_client; @@ -88,6 +90,7 @@ #define MGCP_MSG_PRESENCE_AUDIO_IP 0x0008 #define MGCP_MSG_PRESENCE_AUDIO_PORT 0x0010 #define MGCP_MSG_PRESENCE_CONN_MODE 0x0020 +#define MGCP_MSG_PRESENCE_X_OSMO_IGN 0x8000 struct mgcp_msg { enum mgcp_verb verb; @@ -104,6 +107,7 @@ unsigned int codecs_len; struct ptmap ptmap[MGCP_MAX_CODECS]; unsigned int ptmap_len; + uint32_t x_osmo_ign; }; void mgcp_client_conf_init(struct mgcp_client_conf *conf); diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index 81d3dea..bb07872 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -42,6 +42,11 @@ /*! RTP payload type map length (optional, only needed when payload * types are used that differ from what IANA/3GPP defines) */ unsigned int ptmap_len; + + /*! If nonzero, send 'X-Osmo-IGN:' header. This is useful e.g. for SCCPlite MSCs where the MSC is + * known to issue incoherent or unknown CallIDs / to issue CRCX commands with a different domain + * name than the BSC. An OsmoMGW will then ignore these and not fail on mismatches. */ + uint32_t x_osmo_ign; }; struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, uint32_t parent_term_evt, diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index c10abc9..e9d7b3f 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1313,6 +1313,13 @@ msgb_printf(msg, "M: %s\r\n", mgcp_client_cmode_name(mgcp_msg->conn_mode)); + /* Add X-Osmo-IGN */ + if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_X_OSMO_IGN) + && (mgcp_msg->x_osmo_ign != 0)) + rc += + msgb_printf(msg, MGCP_X_OSMO_IGN_HEADER "%s\r\n", + mgcp_msg->x_osmo_ign & MGCP_X_OSMO_IGN_CALLID ? " C": ""); + /* Add session description protocol (SDP) */ if (use_sdp && (mgcp_msg->verb == MGCP_VERB_CRCX diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 770db5e..0b5a251 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -119,6 +119,11 @@ osmo_strlcpy(mgcp_msg->endpoint, info->endpoint, MGCP_ENDPOINT_MAXLEN); memcpy(mgcp_msg->codecs, info->codecs, sizeof(mgcp_msg->codecs)); memcpy(mgcp_msg->ptmap, info->ptmap, sizeof(mgcp_msg->ptmap)); + + if (info->x_osmo_ign) { + mgcp_msg->x_osmo_ign = info->x_osmo_ign; + mgcp_msg->presence |= MGCP_MSG_PRESENCE_X_OSMO_IGN; + } } static void add_audio(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info) diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 10d078a..48fcd70 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -30,7 +30,7 @@ #include -#define MGW_STR "Configure MGCP connection to Media Gateway\n" +#define MGW_STR MGCP_CLIENT_MGW_STR void *global_mgcp_client_ctx = NULL; struct mgcp_client_conf *global_mgcp_client_conf = NULL; diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index a5bef7b..a7c8b47 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -407,6 +407,11 @@ if (!endp) return -1; + + /* Accept any CallID for "X-Osmo-IGN: C" */ + if (endp->x_osmo_ign & MGCP_X_OSMO_IGN_CALLID) + return 0; + if (!callid) return -1; if (!endp->callid) diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index ea80907..cb2c965 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -715,12 +715,31 @@ mode = (const char *)line + 3; break; case 'X': - /* If osmoux is disabled, just skip setting it up */ - if (!p->endp->cfg->osmux) - break; - if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == - 0) + if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { + /* If osmux is disabled, just skip setting it up */ + if (!p->endp->cfg->osmux) + break; osmux_cid = mgcp_osmux_setup(endp, line); + break; + } + + /* Parse X-Osmo-IGN header */ + if (!strncmp(line, MGCP_X_OSMO_IGN_HEADER, + strlen(MGCP_X_OSMO_IGN_HEADER))) { + int i; + int line_len = strlen(line); + for (i = strlen(MGCP_X_OSMO_IGN_HEADER); i < line_len; i++) { + switch (line[i]) { + case 'C': + endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + break; + default: + break; + } + } + break; + } + /* Ignore unknown X-headers */ break; case '\0': have_sdp = 1; diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index ea79485..70b4be5 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -309,6 +309,32 @@ "a=rtpmap:97 GSM-EFR/8000\r\n" \ "a=ptime:20\r\n" +#define CRCX_X_OSMO_IGN \ + "CRCX 2 1 at mgw MGCP 1.0\r\n" \ + "M: recvonly\r\n" \ + "C: 2\r\n" \ + "L: p:20\r\n" \ + "X-Osmo-IGN: C\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "c=IN IP4 123.12.12.123\r\n" \ + "m=audio 5904 RTP/AVP 97\r\n" \ + "a=rtpmap:97 GSM-EFR/8000\r\n" \ + "a=ptime:40\r\n" + +#define CRCX_X_OSMO_IGN_RET \ + "200 2 OK\r\n" \ + "I: %s\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "o=- %s 23 IN IP4 0.0.0.0\r\n" \ + "s=-\r\n" \ + "c=IN IP4 0.0.0.0\r\n" \ + "t=0 0\r\n" \ + "m=audio 16012 RTP/AVP 97\r\n" \ + "a=rtpmap:97 GSM-EFR/8000\r\n" \ + "a=ptime:40\r\n" + #define DLCX \ "DLCX 7 1 at mgw MGCP 1.0\r\n" \ "I: %s\r\n" \ @@ -482,6 +508,7 @@ "a=fmtp:126 0/1/2"}, {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE,.extra_fmtp = "a=fmtp:126 0/1/2"}, {"CRCX", CRCX_NO_LCO_NO_SDP, CRCX_NO_LCO_NO_SDP_RET, 97}, + {"CRCX", CRCX_X_OSMO_IGN, CRCX_X_OSMO_IGN_RET, 97}, }; static const struct mgcp_test retransmit[] = { diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 9838f4d..bdaf5d7 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -427,6 +427,29 @@ M: recvonly C: 2 L: p:20 +X-Osmo-IGN: C + +v=0 +c=IN IP4 123.12.12.123 +m=audio 5904 RTP/AVP 97 +a=rtpmap:97 GSM-EFR/8000 +a=ptime:40 + +---------8<--------- +checking response: +using message with patched conn_id for comparison +Response matches our expectations. +(response does not contain a connection id) +Dummy packets: 2 + +================================================ +Testing CRCX +creating message from statically defined input: +---------8<--------- +CRCX 2 1 at mgw MGCP 1.0 +M: recvonly +C: 2 +L: p:20 v=0 c=IN IP4 123.12.12.123 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 9978f79..2662fc1 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -180,7 +180,8 @@ .codecs_len = 1, .ptmap[0].codec = CODEC_GSMEFR_8000_1, .ptmap[0].pt = 96, - .ptmap_len = 1 + .ptmap_len = 1, + .x_osmo_ign = MGCP_X_OSMO_IGN_CALLID, }; if (mgcp) @@ -268,6 +269,16 @@ msg = mgcp_msg_gen(mgcp, &mgcp_msg); printf("%s\n", (char *)msg->data); + printf("Generate X-Osmo-IGN message:\n"); + msg = mgcp_msg_gen(mgcp, &mgcp_msg); + mgcp_msg.verb = MGCP_VERB_CRCX; + mgcp_msg.presence = + (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | + MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE + | MGCP_MSG_PRESENCE_X_OSMO_IGN); + msg = mgcp_msg_gen(mgcp, &mgcp_msg); + printf("%s\n", (char *)msg->data); + printf("Overfolow test:\n"); mgcp_msg.verb = MGCP_VERB_MDCX; mgcp_msg.presence = diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 454ee3d..58c4b82 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -117,6 +117,14 @@ Generated RSIP message: RSIP 9 23 at mgw MGCP 1.0 +Generate X-Osmo-IGN message: +CRCX 11 23 at mgw MGCP 1.0 +C: 2f +I: 11 +L: p:20, a:GSM, nt:IN +M: sendrecv +X-Osmo-IGN: C + Overfolow test: -- To view, visit https://gerrit.osmocom.org/10585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 Gerrit-Change-Number: 10585 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 17:32:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 23 Aug 2018 17:32:53 +0000 Subject: Change in osmo-bsc[master]: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10586 Change subject: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default ...................................................................... MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default Use libosmo-mgcp-client's new X-Osmo-IGN header to indicate that CallIDs are allowed to mismatch. Add VTY commands 'msc' / 'mgw x-osmo-ign call-id' and 'no mgw x-osmo-ign' to switch this behavior explicitly. For SCCPlite MSCs, unless a specific config was issued, always send 'X-Osmo-IGN: C' by default, to ignore CallID mismatches. Depends: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 (osmo-mgw) Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 54 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/10586/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 7ec3442..6ca0330 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -130,6 +130,9 @@ * BSSMAP RESET procedure */ struct osmo_fsm_inst *reset_fsm; } a; + + uint32_t x_osmo_ign; + bool x_osmo_ign_configured; }; /* diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 091af5e..93883af 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -29,6 +29,7 @@ #include #include #include +#include static struct osmo_fsm lchan_rtp_fsm; @@ -154,8 +155,11 @@ lchan->mgw_endpoint_ci_bts = mgw_endpoint_ci_add(mgwep, "to-BTS"); - if (lchan->conn) + if (lchan->conn) { crcx_info.call_id = lchan->conn->sccp.conn_id; + if (lchan->conn->sccp.msc) + crcx_info.x_osmo_ign = lchan->conn->sccp.msc->x_osmo_ign; + } crcx_info.ptime = 20; mgcp_pick_codec(&crcx_info, lchan, true); diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 7e5f5f6..96f0687 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -35,6 +35,7 @@ #include #include #include +#include /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ @@ -496,6 +497,15 @@ if (!msc->a.sccp) return -EINVAL; + /* In SCCPlite, the MSC side of the MGW endpoint is configured by the MSC. Since we have + * no way to figure out which CallID ('C:') the MSC will issue in its CRCX command, set + * an X-Osmo-IGN flag telling osmo-mgw to ignore CallID mismatches for this endpoint. + * If an explicit VTY command has already indicated whether or not to send X-Osmo-IGN, do + * not overwrite that setting. */ + if (msc->a.asp_proto == OSMO_SS7_ASP_PROT_IPA + && !msc->x_osmo_ign_configured) + msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + /* If unset, use default local SCCP address */ if (!msc->a.bsc_addr.presence) osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp, diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index efa12e0..cd32b03 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -191,6 +191,13 @@ /* write MGW configuration */ mgcp_client_config_write(vty, " "); + + if (msc->x_osmo_ign_configured) { + if (!msc->x_osmo_ign) + vty_out(vty, " no mgw x-osmo-ign%s", VTY_NEWLINE); + else + vty_out(vty, " mgw x-osmo-ign call-id%s", VTY_NEWLINE); + } } static int config_write_msc(struct vty *vty) @@ -672,6 +679,33 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_mgw_x_osmo_ign, + cfg_msc_mgw_x_osmo_ign_cmd, + "mgw x-osmo-ign call-id", + MGCP_CLIENT_MGW_STR + "Set a (non-standard) X-Osmo-IGN header in all CRCX messages for RTP streams" + " associated with this MSC\n" + "Send 'X-Osmo-IGN: C' to ignore CallID mismatches. See OsmoMGW.\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + msc->x_osmo_ign_configured = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_msc_no_mgw_x_osmo_ign, + cfg_msc_no_mgw_x_osmo_ign_cmd, + "no mgw x-osmo-ign", + NO_STR + MGCP_CLIENT_MGW_STR + "Do not send X-Osmo-IGN MGCP header to this MSC\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + msc->x_osmo_ign = 0; + msc->x_osmo_ign_configured = true; + return CMD_SUCCESS; +} + DEFUN(cfg_net_bsc_mid_call_text, cfg_net_bsc_mid_call_text_cmd, "mid-call-text .TEXT", @@ -983,6 +1017,8 @@ install_element(CFG_LOG_NODE, &logging_fltr_imsi_cmd); mgcp_client_vty_init(net, MSC_NODE, net->mgw.conf); + install_element(MSC_NODE, &cfg_msc_mgw_x_osmo_ign_cmd); + install_element(MSC_NODE, &cfg_msc_no_mgw_x_osmo_ign_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/10586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe Gerrit-Change-Number: 10586 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 18:43:59 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 23 Aug 2018 18:43:59 +0000 Subject: Change in libosmocore[master]: socket: add flag to enforce SO_REUSEADDR on UDP sockets Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10587 Change subject: socket: add flag to enforce SO_REUSEADDR on UDP sockets ...................................................................... socket: add flag to enforce SO_REUSEADDR on UDP sockets When IPPROTO_UDP is used then SO_REUSEADDR omitted since UDP is connection less we do not have to wait until lingering connections time out. There were also negative effects such as that two applicatications could use the same UDP port, normally one of the two applications would get an error, but with SO_REUSEADDR this is supressed. However, there are applications (UDP MULTICAST) where two applications must be able to use the same port. In the osmocom project those are osmo-bts-virtual, virtphy and gsmtap in general. Lets introduce a flag that the API user can supply in order to have SO_REUSEADDR applied. - Add new flag OSMO_SOCK_F_UDP_REUSEADDR Change-Id: I94aaf6d5224ab23bde5ea5c4a83569b6145ab32b Related: OS#3497 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/10587/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 20515b9..f23a243 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -24,6 +24,8 @@ #define OSMO_SOCK_F_NO_MCAST_LOOP (1 << 3) /*! disable receiving all multiast even for non-subscribed groups */ #define OSMO_SOCK_F_NO_MCAST_ALL (1 << 4) +/*! use SO_REUSEADDR on UDP ports (required for multicast) */ +#define OSMO_SOCK_F_UDP_REUSEADDR (1 << 5) int osmo_sock_init(uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 210dbf9..7e7f6d9 100644 --- a/src/socket.c +++ b/src/socket.c @@ -209,7 +209,7 @@ if (sfd < 0) continue; - if (proto != IPPROTO_UDP) { + if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (rc < 0) { @@ -349,7 +349,7 @@ continue; } } else { - if (proto != IPPROTO_UDP) { + if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (rc < 0) { @@ -379,7 +379,7 @@ return -ENODEV; } - if (proto != IPPROTO_UDP) { + if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (rc < 0) { LOGP(DLGLOBAL, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/10587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I94aaf6d5224ab23bde5ea5c4a83569b6145ab32b Gerrit-Change-Number: 10587 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 18:44:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 23 Aug 2018 18:44:00 +0000 Subject: Change in libosmocore[master]: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10588 Change subject: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP ...................................................................... gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP When gsmtap adding a new sink it does not supply OSMO_SOCK_F_UDP_REUSEADDR in order to have SO_REUSEADDR applied. Even when the gsmtap sink is just receiving packets to toss them immediately, its technically a multicast application. This is because every application that outputs gsmtap also adds its own sink. Therefore SO_REUSEADDR must be applied. Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Related: OS#3497 --- M src/gsmtap_util.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/10588/1 diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c index b21c690..385b467 100644 --- a/src/gsmtap_util.c +++ b/src/gsmtap_util.c @@ -254,7 +254,9 @@ if (osmo_sockaddr_is_local((struct sockaddr *)&ss, ss_len) == 1) { rc = osmo_sock_init_sa((struct sockaddr *)&ss, SOCK_DGRAM, - IPPROTO_UDP, OSMO_SOCK_F_BIND); + IPPROTO_UDP, + OSMO_SOCK_F_BIND | + OSMO_SOCK_F_UDP_REUSEADDR); if (rc >= 0) return rc; } -- To view, visit https://gerrit.osmocom.org/10588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Gerrit-Change-Number: 10588 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 18:44:29 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 23 Aug 2018 18:44:29 +0000 Subject: Change in osmo-bts[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10589 Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... osmo_mcast_sock: make sure SO_REUSEADDR is applied osmo-bts-virtual uses UDP multicast to communicate with its virtphy counterpart. At the momemnt SO_REUSEADDR is not applied for those multicast connections because OSMO_SOCK_F_UDP_REUSEADDR is not set. This makes prevents the proper function of UDP multicast. - Make sure OSMO_SOCK_F_UDP_REUSEADDR is set Change-Id: I7f27758b7aa786c8dbae669cbcde10baab8e4845 Depends: libosmocore I1399a428467ca12f1564a14eb8ffb294d4f59874 Related: OS#3497 --- M src/osmo-bts-virtual/osmo_mcast_sock.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/10589/1 diff --git a/src/osmo-bts-virtual/osmo_mcast_sock.c b/src/osmo-bts-virtual/osmo_mcast_sock.c index f092a73..c0f0af5 100644 --- a/src/osmo-bts-virtual/osmo_mcast_sock.c +++ b/src/osmo-bts-virtual/osmo_mcast_sock.c @@ -17,7 +17,7 @@ uint16_t tx_mcast_port, bool loopback) { int rc; - unsigned int flags = OSMO_SOCK_F_CONNECT; + unsigned int flags = OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_UDP_REUSEADDR; if (!loopback) flags |= OSMO_SOCK_F_NO_MCAST_LOOP; @@ -41,6 +41,7 @@ void *osmo_fd_data) { int rc; + unsigned int flags = OSMO_SOCK_F_BIND | OSMO_SOCK_F_NO_MCAST_ALL | OSMO_SOCK_F_UDP_REUSEADDR; ofd->cb = fd_rx_cb; ofd->when = BSC_FD_READ; @@ -48,7 +49,7 @@ /* Create mcast client socket */ rc = osmo_sock_init_ofd(ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, - NULL, mcast_port, OSMO_SOCK_F_BIND|OSMO_SOCK_F_NO_MCAST_ALL); + NULL, mcast_port, flags); if (rc < 0) { perror("Could not create mcast client socket"); return rc; -- To view, visit https://gerrit.osmocom.org/10589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7f27758b7aa786c8dbae669cbcde10baab8e4845 Gerrit-Change-Number: 10589 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 23 18:45:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 23 Aug 2018 18:45:03 +0000 Subject: Change in osmocom-bb[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10590 Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... osmo_mcast_sock: make sure SO_REUSEADDR is applied virtphy uses UDP multicast to communicate with its osmo-bts-virtual counterpart. At the momemnt SO_REUSEADDR is not applied for those multicast connections because OSMO_SOCK_F_UDP_REUSEADDR is not set. This makes prevents the proper function of UDP multicast. - Make sure OSMO_SOCK_F_UDP_REUSEADDR is set Change-Id: Ia1014ac5e0522e77178249cdc6398dec2168bffe Depends: libosmocore I1399a428467ca12f1564a14eb8ffb294d4f59874 Related: OS#3497 --- M src/host/virt_phy/src/shared/osmo_mcast_sock.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/90/10590/1 diff --git a/src/host/virt_phy/src/shared/osmo_mcast_sock.c b/src/host/virt_phy/src/shared/osmo_mcast_sock.c index b52e005..9a713fc 100644 --- a/src/host/virt_phy/src/shared/osmo_mcast_sock.c +++ b/src/host/virt_phy/src/shared/osmo_mcast_sock.c @@ -17,7 +17,7 @@ uint16_t tx_mcast_port, bool loopback) { int rc; - unsigned int flags = OSMO_SOCK_F_CONNECT; + unsigned int flags = OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_UDP_REUSEADDR; if (!loopback) flags |= OSMO_SOCK_F_NO_MCAST_LOOP; @@ -41,6 +41,7 @@ void *osmo_fd_data) { int rc; + unsigned int flags = OSMO_SOCK_F_BIND | OSMO_SOCK_F_NO_MCAST_ALL | OSMO_SOCK_F_UDP_REUSEADDR; ofd->cb = fd_rx_cb; ofd->when = BSC_FD_READ; @@ -48,7 +49,7 @@ /* Create mcast client socket */ rc = osmo_sock_init_ofd(ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, - NULL, mcast_port, OSMO_SOCK_F_BIND|OSMO_SOCK_F_NO_MCAST_ALL); + NULL, mcast_port, flags); if (rc < 0) { perror("Could not create mcast client socket"); return rc; -- To view, visit https://gerrit.osmocom.org/10590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1014ac5e0522e77178249cdc6398dec2168bffe Gerrit-Change-Number: 10590 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:32:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:32:08 +0000 Subject: Change in docker-playground[master]: use non-overlapping IP networks for bsc-sccplite and HLR tests Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10596 Change subject: use non-overlapping IP networks for bsc-sccplite and HLR tests ...................................................................... use non-overlapping IP networks for bsc-sccplite and HLR tests The HLR test is already using 172.18.11.x, let's migrate sccplite to 172.18.12.x to prevent any conflicts when running both tests on the same build slave (docker instance). Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/sccplite/BSC_Tests.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 3 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/96/10596/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 2bf29f6..a0e9e0c 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -8,11 +8,11 @@ mkdir $VOL_BASE_DIR/bsc cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ -network_create 172.18.11.0/24 +network_create 172.18.12.0/24 echo Starting container with BSC docker run --rm \ - --network $NET_NAME --ip 172.18.11.20 \ + --network $NET_NAME --ip 172.18.12.20 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ $REPO_USER/osmo-bsc-master @@ -20,14 +20,14 @@ for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ - --network $NET_NAME --ip 172.18.11.10$i \ + --network $NET_NAME --ip 172.18.12.10$i \ --name ${BUILD_TAG}-bts$i -d \ - $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.11.20 $((i + 1234)) 1 + $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1 done echo Starting container with BSC testsuite docker run --rm \ - --network $NET_NAME --ip 172.18.11.203 \ + --network $NET_NAME --ip 172.18.12.203 \ -e "TTCN3_PCAP_PATH=/data" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg index b1e3ae7..adb126c 100644 --- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg +++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg @@ -6,15 +6,15 @@ *.JUnitLogger.testsuite_name := "BSC_Tests" [TESTPORT_PARAMETERS] -*.BSCVTY.CTRL_HOSTNAME := "172.18.11.20" +*.BSCVTY.CTRL_HOSTNAME := "172.18.12.20" [MODULE_PARAMETERS] -BSC_Tests.mp_bsc_ip := "172.18.11.20"; -BSC_Tests.mp_test_ip := "172.18.11.203"; +BSC_Tests.mp_bsc_ip := "172.18.12.20"; +BSC_Tests.mp_test_ip := "172.18.12.203"; BSC_Tests.mp_bssap_cfg := { transport := BSSAP_TRANSPORT_SCCPlite_SERVER, sccp_service_type := "mtp3_itu", - sctp_addr := { 5000, "172.18.11.203", -1, "" }, + sctp_addr := { 5000, "172.18.12.203", -1, "" }, own_pc := 185, own_ssn := 254, peer_pc := 187, diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 5fb8710..858aa50 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -56,7 +56,7 @@ cs7 instance 0 point-code 0.23.3 asp asp-clnt-msc-0 5000 0 ipa - remote-ip 172.18.11.203 + remote-ip 172.18.12.203 as as-clnt-msc-0 ipa asp asp-clnt-msc-0 routing-key 0 0.23.3 @@ -363,7 +363,7 @@ amr-config 5_15k forbidden amr-config 4_75k forbidden codec-list fr1 fr2 fr3 hr1 hr3 - mgw remote-ip 172.18.11.203 + mgw remote-ip 172.18.12.203 asp-protocol ipa bsc mid-call-timeout 0 -- To view, visit https://gerrit.osmocom.org/10596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe Gerrit-Change-Number: 10596 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:33:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:33:18 +0000 Subject: Change in docker-playground[master]: use non-overlapping IP networks for bsc-sccplite and SIP tests In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10596 ) Change subject: use non-overlapping IP networks for bsc-sccplite and SIP tests ...................................................................... use non-overlapping IP networks for bsc-sccplite and SIP tests The osmo-sip-connector test is already using 172.18.11.x, let's migrate sccplite to 172.18.12.x to prevent any conflicts when running both tests on the same build slave (docker instance). Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/sccplite/BSC_Tests.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 3 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/96/10596/2 -- To view, visit https://gerrit.osmocom.org/10596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe Gerrit-Change-Number: 10596 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:33:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:33:50 +0000 Subject: Change in docker-playground[master]: use non-overlapping IP networks for bsc-sccplite and SIP tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10596 ) Change subject: use non-overlapping IP networks for bsc-sccplite and SIP tests ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe Gerrit-Change-Number: 10596 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 24 Aug 2018 06:33:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:33:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:33:51 +0000 Subject: Change in docker-playground[master]: use non-overlapping IP networks for bsc-sccplite and SIP tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10596 ) Change subject: use non-overlapping IP networks for bsc-sccplite and SIP tests ...................................................................... use non-overlapping IP networks for bsc-sccplite and SIP tests The osmo-sip-connector test is already using 172.18.11.x, let's migrate sccplite to 172.18.12.x to prevent any conflicts when running both tests on the same build slave (docker instance). Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/sccplite/BSC_Tests.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 3 files changed, 11 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 2bf29f6..a0e9e0c 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -8,11 +8,11 @@ mkdir $VOL_BASE_DIR/bsc cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ -network_create 172.18.11.0/24 +network_create 172.18.12.0/24 echo Starting container with BSC docker run --rm \ - --network $NET_NAME --ip 172.18.11.20 \ + --network $NET_NAME --ip 172.18.12.20 \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ $REPO_USER/osmo-bsc-master @@ -20,14 +20,14 @@ for i in `seq 0 2`; do echo Starting container with OML for BTS$i docker run --rm \ - --network $NET_NAME --ip 172.18.11.10$i \ + --network $NET_NAME --ip 172.18.12.10$i \ --name ${BUILD_TAG}-bts$i -d \ - $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.11.20 $((i + 1234)) 1 + $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1 done echo Starting container with BSC testsuite docker run --rm \ - --network $NET_NAME --ip 172.18.11.203 \ + --network $NET_NAME --ip 172.18.12.203 \ -e "TTCN3_PCAP_PATH=/data" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg index b1e3ae7..adb126c 100644 --- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg +++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg @@ -6,15 +6,15 @@ *.JUnitLogger.testsuite_name := "BSC_Tests" [TESTPORT_PARAMETERS] -*.BSCVTY.CTRL_HOSTNAME := "172.18.11.20" +*.BSCVTY.CTRL_HOSTNAME := "172.18.12.20" [MODULE_PARAMETERS] -BSC_Tests.mp_bsc_ip := "172.18.11.20"; -BSC_Tests.mp_test_ip := "172.18.11.203"; +BSC_Tests.mp_bsc_ip := "172.18.12.20"; +BSC_Tests.mp_test_ip := "172.18.12.203"; BSC_Tests.mp_bssap_cfg := { transport := BSSAP_TRANSPORT_SCCPlite_SERVER, sccp_service_type := "mtp3_itu", - sctp_addr := { 5000, "172.18.11.203", -1, "" }, + sctp_addr := { 5000, "172.18.12.203", -1, "" }, own_pc := 185, own_ssn := 254, peer_pc := 187, diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 5fb8710..858aa50 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -56,7 +56,7 @@ cs7 instance 0 point-code 0.23.3 asp asp-clnt-msc-0 5000 0 ipa - remote-ip 172.18.11.203 + remote-ip 172.18.12.203 as as-clnt-msc-0 ipa asp asp-clnt-msc-0 routing-key 0 0.23.3 @@ -363,7 +363,7 @@ amr-config 5_15k forbidden amr-config 4_75k forbidden codec-list fr1 fr2 fr3 hr1 hr3 - mgw remote-ip 172.18.11.203 + mgw remote-ip 172.18.12.203 asp-protocol ipa bsc mid-call-timeout 0 -- To view, visit https://gerrit.osmocom.org/10596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96beed1f5e01bdb8e77e20f77a459aa006de10fe Gerrit-Change-Number: 10596 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 24 06:34:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:34:27 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3237?= Message-ID: <977135999.1.1535092467735.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:36:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:36:32 +0000 Subject: Change in libosmocore[master]: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10588 ) Change subject: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP ...................................................................... Patch Set 1: Code-Review+1 (1 comment) fine, except the commitlog. https://gerrit.osmocom.org/#/c/10588/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10588/1//COMMIT_MSG at 11 PS1, Line 11: its technically a multicast : application this is not true. It is typically not a multicast application as it doesn't use IP multicast addresses, and the listeners don't use any of the socket options to bind to a given multicast IP either. I think it's best to actually describe the problem with virtphy here, and indicating that virtphy uses GSMTAP in multicast mode. -- To view, visit https://gerrit.osmocom.org/10588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Gerrit-Change-Number: 10588 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 06:36:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:36:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:36:41 +0000 Subject: Change in libosmocore[master]: socket: add flag to enforce SO_REUSEADDR on UDP sockets In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10587 ) Change subject: socket: add flag to enforce SO_REUSEADDR on UDP sockets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I94aaf6d5224ab23bde5ea5c4a83569b6145ab32b Gerrit-Change-Number: 10587 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 06:36:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:36:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:36:42 +0000 Subject: Change in libosmocore[master]: socket: add flag to enforce SO_REUSEADDR on UDP sockets In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10587 ) Change subject: socket: add flag to enforce SO_REUSEADDR on UDP sockets ...................................................................... socket: add flag to enforce SO_REUSEADDR on UDP sockets When IPPROTO_UDP is used then SO_REUSEADDR omitted since UDP is connection less we do not have to wait until lingering connections time out. There were also negative effects such as that two applicatications could use the same UDP port, normally one of the two applications would get an error, but with SO_REUSEADDR this is supressed. However, there are applications (UDP MULTICAST) where two applications must be able to use the same port. In the osmocom project those are osmo-bts-virtual, virtphy and gsmtap in general. Lets introduce a flag that the API user can supply in order to have SO_REUSEADDR applied. - Add new flag OSMO_SOCK_F_UDP_REUSEADDR Change-Id: I94aaf6d5224ab23bde5ea5c4a83569b6145ab32b Related: OS#3497 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 20515b9..f23a243 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -24,6 +24,8 @@ #define OSMO_SOCK_F_NO_MCAST_LOOP (1 << 3) /*! disable receiving all multiast even for non-subscribed groups */ #define OSMO_SOCK_F_NO_MCAST_ALL (1 << 4) +/*! use SO_REUSEADDR on UDP ports (required for multicast) */ +#define OSMO_SOCK_F_UDP_REUSEADDR (1 << 5) int osmo_sock_init(uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 210dbf9..7e7f6d9 100644 --- a/src/socket.c +++ b/src/socket.c @@ -209,7 +209,7 @@ if (sfd < 0) continue; - if (proto != IPPROTO_UDP) { + if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (rc < 0) { @@ -349,7 +349,7 @@ continue; } } else { - if (proto != IPPROTO_UDP) { + if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (rc < 0) { @@ -379,7 +379,7 @@ return -ENODEV; } - if (proto != IPPROTO_UDP) { + if (proto != IPPROTO_UDP || flags & OSMO_SOCK_F_UDP_REUSEADDR) { rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); if (rc < 0) { LOGP(DLGLOBAL, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/10587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I94aaf6d5224ab23bde5ea5c4a83569b6145ab32b Gerrit-Change-Number: 10587 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:37:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:37:51 +0000 Subject: Change in osmocom-bb[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10590 ) Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... Patch Set 1: I wonder how this could have passed the build test if the libosmocore patch wasn't already merged last night at 8:46pm... -- To view, visit https://gerrit.osmocom.org/10590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1014ac5e0522e77178249cdc6398dec2168bffe Gerrit-Change-Number: 10590 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 24 Aug 2018 06:37:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:44:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:44:06 +0000 Subject: Change in osmocom-bb[master]: jenkins.sh: Don't only build-verify layer23 but all other host progra... Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10597 Change subject: jenkins.sh: Don't only build-verify layer23 but all other host programs, too ...................................................................... jenkins.sh: Don't only build-verify layer23 but all other host programs, too Change-Id: I204d19ce3ac085add92242c0a03bffb9abc9113d --- M contrib/jenkins.sh 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/97/10597/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 78c0b59..f886c21 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -27,9 +27,12 @@ echo set -x -cd src/host/layer23 -autoreconf -fi -./configure -make + +for dir in gprsdecode gsmmap layer23 osmocon trxcon virt_phy; do + cd $base/src/host/$dir + autoreconf -fi + ./configure + make +done osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/10597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I204d19ce3ac085add92242c0a03bffb9abc9113d Gerrit-Change-Number: 10597 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:45:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:45:25 +0000 Subject: Change in osmocom-bb[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10590 ) Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... Patch Set 1: > I wonder how this could have passed the build test if the > libosmocore patch wasn't already merged last night at 8:46pm... It seems we ever only build-tested src/host/layer23 and none of the others (osmocon, virt_phy, trxcon, gsmmap, gprsdecode). I'm fixing this before merging any other osmocom-bb patches -- To view, visit https://gerrit.osmocom.org/10590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1014ac5e0522e77178249cdc6398dec2168bffe Gerrit-Change-Number: 10590 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 24 Aug 2018 06:45:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:46:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:46:59 +0000 Subject: Change in osmocom-bb[master]: jenkins.sh: Don't only build-verify layer23 but all other host progra... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10597 ) Change subject: jenkins.sh: Don't only build-verify layer23 but all other host programs, too ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204d19ce3ac085add92242c0a03bffb9abc9113d Gerrit-Change-Number: 10597 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 06:46:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:48:39 +0000 Subject: Change in osmocom-bb[master]: jenkins.sh: Don't only build-verify layer23 but all other host progra... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10597 ) Change subject: jenkins.sh: Don't only build-verify layer23 but all other host programs, too ...................................................................... jenkins.sh: Don't only build-verify layer23 but all other host programs, too Change-Id: I204d19ce3ac085add92242c0a03bffb9abc9113d --- M contrib/jenkins.sh 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 78c0b59..f886c21 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -27,9 +27,12 @@ echo set -x -cd src/host/layer23 -autoreconf -fi -./configure -make + +for dir in gprsdecode gsmmap layer23 osmocon trxcon virt_phy; do + cd $base/src/host/$dir + autoreconf -fi + ./configure + make +done osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/10597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I204d19ce3ac085add92242c0a03bffb9abc9113d Gerrit-Change-Number: 10597 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 24 06:50:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:50:47 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5114?= Message-ID: <176070324.3.1535093447121.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Aug 24 06:51:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:51:31 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5114?= Message-ID: <1084092211.4.1535093491120.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Aug 24 06:57:28 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:57:28 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5341?= Message-ID: <860219393.5.1535093848526.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Aug 24 06:58:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:58:02 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#5341?= Message-ID: <734986397.6.1535093882903.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:58:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:58:22 +0000 Subject: Change in osmocom-bb[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10590 ) Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1014ac5e0522e77178249cdc6398dec2168bffe Gerrit-Change-Number: 10590 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 06:58:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 06:58:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 06:58:25 +0000 Subject: Change in osmocom-bb[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10590 ) Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... osmo_mcast_sock: make sure SO_REUSEADDR is applied virtphy uses UDP multicast to communicate with its osmo-bts-virtual counterpart. At the momemnt SO_REUSEADDR is not applied for those multicast connections because OSMO_SOCK_F_UDP_REUSEADDR is not set. This makes prevents the proper function of UDP multicast. - Make sure OSMO_SOCK_F_UDP_REUSEADDR is set Change-Id: Ia1014ac5e0522e77178249cdc6398dec2168bffe Depends: libosmocore I1399a428467ca12f1564a14eb8ffb294d4f59874 Related: OS#3497 --- M src/host/virt_phy/src/shared/osmo_mcast_sock.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/virt_phy/src/shared/osmo_mcast_sock.c b/src/host/virt_phy/src/shared/osmo_mcast_sock.c index b52e005..9a713fc 100644 --- a/src/host/virt_phy/src/shared/osmo_mcast_sock.c +++ b/src/host/virt_phy/src/shared/osmo_mcast_sock.c @@ -17,7 +17,7 @@ uint16_t tx_mcast_port, bool loopback) { int rc; - unsigned int flags = OSMO_SOCK_F_CONNECT; + unsigned int flags = OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_UDP_REUSEADDR; if (!loopback) flags |= OSMO_SOCK_F_NO_MCAST_LOOP; @@ -41,6 +41,7 @@ void *osmo_fd_data) { int rc; + unsigned int flags = OSMO_SOCK_F_BIND | OSMO_SOCK_F_NO_MCAST_ALL | OSMO_SOCK_F_UDP_REUSEADDR; ofd->cb = fd_rx_cb; ofd->when = BSC_FD_READ; @@ -48,7 +49,7 @@ /* Create mcast client socket */ rc = osmo_sock_init_ofd(ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, - NULL, mcast_port, OSMO_SOCK_F_BIND|OSMO_SOCK_F_NO_MCAST_ALL); + NULL, mcast_port, flags); if (rc < 0) { perror("Could not create mcast client socket"); return rc; -- To view, visit https://gerrit.osmocom.org/10590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia1014ac5e0522e77178249cdc6398dec2168bffe Gerrit-Change-Number: 10590 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 24 06:59:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:59:31 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1871?= Message-ID: <1594027767.7.1535093971515.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Aug 24 06:59:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:59:49 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#2599?= Message-ID: <1967003394.8.1535093989186.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri Aug 24 06:59:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 06:59:59 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?enable-mgcp-transcoding,--enable-?= =?UTF-8?Q?smpp,osmocom-master-debian9_#2599?= Message-ID: <524515259.9.1535093999883.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Aug 24 07:00:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 07:00:57 +0000 Subject: Change in osmo-mgw[master]: add X-Osmo-IGN MGCP header to ignore CallID In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10585 ) Change subject: add X-Osmo-IGN MGCP header to ignore CallID ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 Gerrit-Change-Number: 10585 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 07:00:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:28:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:28:18 +0000 Subject: Change in osmocom-bb[master]: osmocon: fix read buffer overrun in romload_prepare_block() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10575 ) Change subject: osmocon: fix read buffer overrun in romload_prepare_block() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie2955e11dd1af75574536774ef7ddf88ddf1fe8b Gerrit-Change-Number: 10575 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:28:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:28:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:28:20 +0000 Subject: Change in osmocom-bb[master]: osmocon: fix read buffer overrun in romload_prepare_block() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10575 ) Change subject: osmocon: fix read buffer overrun in romload_prepare_block() ...................................................................... osmocon: fix read buffer overrun in romload_prepare_block() Address sanitizer triggered when trying to chainload firmware: ==18466==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x631000027850 at pc 0x7f5b94cfb733 bp 0x7ffe33e1ae30 sp 0x7ffe33e1a5d8 READ of size 1014 at 0x631000027850 thread T0 #0 0x7f5b94cfb732 (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x79732) #1 0x563db4293e6e in memcpy /usr/include/x86_64-linux-gnu/bits/string_fortified.h:34 #2 0x563db4293e6e in romload_prepare_block osmocom-bb/src/host/osmocon/osmocon.c:473 #3 0x563db429541f in handle_read_romload osmocom-bb/src/host/osmocon/osmocon.c:959 #4 0x563db429541f in serial_read osmocom-bb/src/host/osmocon/osmocon.c:1168 #5 0x7f5b94722c83 in osmo_fd_disp_fds libosmocore/src/select.c:217 #6 0x7f5b94722f84 in osmo_select_main libosmocore/src/select.c:257 #7 0x563db4293b1c in main osmocom-bb/src/host/osmocon/osmocon.c:1525 #8 0x7f5b942b9b96 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b96) #9 0x563db4293c79 in _start (prefix/sbin/osmocon+0x1c79) 0x631000027850 is located 0 bytes to the right of 77904-byte region [0x631000014800,0x631000027850) allocated by thread T0 here: #0 0x7f5b94d60b50 in __interceptor_malloc (/usr/lib/x86_64-linux-gnu/libasan.so.4+0xdeb50) #1 0x563db4294d65 in read_file osmocom-bb/src/host/osmocon/osmocon.c:314 Change-Id: Ie2955e11dd1af75574536774ef7ddf88ddf1fe8b --- M src/host/osmocon/osmocon.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index a9497dc..6075e61 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -471,7 +471,7 @@ remaining_bytes = dnload.data_len - 3 - (dnload.block_payload_size * dnload.block_number); - memcpy(block_data, dnload.write_ptr, dnload.block_payload_size); + memcpy(block_data, dnload.write_ptr, OSMO_MIN(dnload.block_payload_size, remaining_bytes)); if (remaining_bytes <= dnload.block_payload_size) { fill_bytes = (dnload.block_payload_size - remaining_bytes); -- To view, visit https://gerrit.osmocom.org/10575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie2955e11dd1af75574536774ef7ddf88ddf1fe8b Gerrit-Change-Number: 10575 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:28:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:28:36 +0000 Subject: Change in osmo-bts[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10589 ) Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7f27758b7aa786c8dbae669cbcde10baab8e4845 Gerrit-Change-Number: 10589 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:28:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:28:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:28:37 +0000 Subject: Change in osmo-bts[master]: osmo_mcast_sock: make sure SO_REUSEADDR is applied In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10589 ) Change subject: osmo_mcast_sock: make sure SO_REUSEADDR is applied ...................................................................... osmo_mcast_sock: make sure SO_REUSEADDR is applied osmo-bts-virtual uses UDP multicast to communicate with its virtphy counterpart. At the momemnt SO_REUSEADDR is not applied for those multicast connections because OSMO_SOCK_F_UDP_REUSEADDR is not set. This makes prevents the proper function of UDP multicast. - Make sure OSMO_SOCK_F_UDP_REUSEADDR is set Change-Id: I7f27758b7aa786c8dbae669cbcde10baab8e4845 Depends: libosmocore I1399a428467ca12f1564a14eb8ffb294d4f59874 Related: OS#3497 --- M src/osmo-bts-virtual/osmo_mcast_sock.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-virtual/osmo_mcast_sock.c b/src/osmo-bts-virtual/osmo_mcast_sock.c index f092a73..c0f0af5 100644 --- a/src/osmo-bts-virtual/osmo_mcast_sock.c +++ b/src/osmo-bts-virtual/osmo_mcast_sock.c @@ -17,7 +17,7 @@ uint16_t tx_mcast_port, bool loopback) { int rc; - unsigned int flags = OSMO_SOCK_F_CONNECT; + unsigned int flags = OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_UDP_REUSEADDR; if (!loopback) flags |= OSMO_SOCK_F_NO_MCAST_LOOP; @@ -41,6 +41,7 @@ void *osmo_fd_data) { int rc; + unsigned int flags = OSMO_SOCK_F_BIND | OSMO_SOCK_F_NO_MCAST_ALL | OSMO_SOCK_F_UDP_REUSEADDR; ofd->cb = fd_rx_cb; ofd->when = BSC_FD_READ; @@ -48,7 +49,7 @@ /* Create mcast client socket */ rc = osmo_sock_init_ofd(ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, - NULL, mcast_port, OSMO_SOCK_F_BIND|OSMO_SOCK_F_NO_MCAST_ALL); + NULL, mcast_port, flags); if (rc < 0) { perror("Could not create mcast client socket"); return rc; -- To view, visit https://gerrit.osmocom.org/10589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7f27758b7aa786c8dbae669cbcde10baab8e4845 Gerrit-Change-Number: 10589 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:31:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:31:26 +0000 Subject: Change in libosmocore[master]: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by dexter. ( https://gerrit.osmocom.org/10588 ) Change subject: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP ...................................................................... gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP When gsmtap adding a new sink it does not supply OSMO_SOCK_F_UDP_REUSEADDR in order to have SO_REUSEADDR applied. In most cases, the gsmtap sink is just receiving packets to toss them immediately, so having one of them is sufficient. However, in other use cases - particularly virt_phy - we actually want to receve and process GSMTAP messages via multicast Applying SO_REUSEADDR (like we did before disabling it globally for UDP in I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 on August 1st) resolves the issue. Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Related: OS#3497 --- M src/gsmtap_util.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/10588/2 -- To view, visit https://gerrit.osmocom.org/10588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Gerrit-Change-Number: 10588 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:31:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:31:31 +0000 Subject: Change in libosmocore[master]: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10588 ) Change subject: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Gerrit-Change-Number: 10588 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:31:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:31:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:31:32 +0000 Subject: Change in libosmocore[master]: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10588 ) Change subject: gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP ...................................................................... gsmtap_util: make sure SO_REUSEADDR is applied for GSMTAP When gsmtap adding a new sink it does not supply OSMO_SOCK_F_UDP_REUSEADDR in order to have SO_REUSEADDR applied. In most cases, the gsmtap sink is just receiving packets to toss them immediately, so having one of them is sufficient. However, in other use cases - particularly virt_phy - we actually want to receve and process GSMTAP messages via multicast Applying SO_REUSEADDR (like we did before disabling it globally for UDP in I4a8ffb8d598aca88801a4a0322944d7cdd8d4047 on August 1st) resolves the issue. Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Related: OS#3497 --- M src/gsmtap_util.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c index b21c690..385b467 100644 --- a/src/gsmtap_util.c +++ b/src/gsmtap_util.c @@ -254,7 +254,9 @@ if (osmo_sockaddr_is_local((struct sockaddr *)&ss, ss_len) == 1) { rc = osmo_sock_init_sa((struct sockaddr *)&ss, SOCK_DGRAM, - IPPROTO_UDP, OSMO_SOCK_F_BIND); + IPPROTO_UDP, + OSMO_SOCK_F_BIND | + OSMO_SOCK_F_UDP_REUSEADDR); if (rc >= 0) return rc; } -- To view, visit https://gerrit.osmocom.org/10588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1399a428467ca12f1564a14eb8ffb294d4f59874 Gerrit-Change-Number: 10588 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:32:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:32:12 +0000 Subject: Change in osmo-mgw[master]: cosmetic: drop code dup in mgcp_client_fsm.c CRCX In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10584 ) Change subject: cosmetic: drop code dup in mgcp_client_fsm.c CRCX ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie51cc86e90ffeca5b66bcb8f6db0d389241abe57 Gerrit-Change-Number: 10584 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:32:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:33:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:33:35 +0000 Subject: Change in osmo-bsc[master]: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10586 ) Change subject: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10586/1/src/osmo-bsc/osmo_bsc_vty.c File src/osmo-bsc/osmo_bsc_vty.c: https://gerrit.osmocom.org/#/c/10586/1/src/osmo-bsc/osmo_bsc_vty.c at 687 PS1, Line 687: " associated with this MSC\n" it might make sense to add "(likely required in SCCPlite based A)" to make it easier to figure out when/why one would want this. One might even go as far as to automatically enable this if SCCPlite is used? -- To view, visit https://gerrit.osmocom.org/10586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe Gerrit-Change-Number: 10586 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 24 Aug 2018 10:33:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:34:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:34:00 +0000 Subject: Change in osmocom-bb[master]: Forget about the callback after use and cancellation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10536 ) Change subject: Forget about the callback after use and cancellation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e8db297e816d3d07a46147d5d3bdc0e8fae6c9a Gerrit-Change-Number: 10536 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:34:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:34:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:34:02 +0000 Subject: Change in osmocom-bb[master]: Forget about the callback after use and cancellation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10536 ) Change subject: Forget about the callback after use and cancellation ...................................................................... Forget about the callback after use and cancellation Don't try to unref something else after we have given up our spot in the table. Change-Id: I4e8db297e816d3d07a46147d5d3bdc0e8fae6c9a --- M src/host/layer23/src/mobile/script_lua.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/script_lua.c b/src/host/layer23/src/mobile/script_lua.c index 4cfe55a..088aab3 100644 --- a/src/host/layer23/src/mobile/script_lua.c +++ b/src/host/layer23/src/mobile/script_lua.c @@ -136,6 +136,7 @@ lua_rawgeti(L, LUA_REGISTRYINDEX, timer->cb_ref); luaL_unref(L, LUA_REGISTRYINDEX, timer->cb_ref); + timer->cb_ref = LUA_NOREF; err = lua_pcall(L, 0, 0, 0); if (err) { @@ -276,6 +277,10 @@ luaL_argcheck(L, lua_isuserdata(L, -1), 1, "No userdata"); timer = lua_touserdata(L, -1); + if (timer->cb_ref != LUA_NOREF) { + luaL_unref(L, LUA_REGISTRYINDEX, timer->cb_ref); + timer->cb_ref = LUA_NOREF; + } prim = mobile_prim_alloc(PRIM_MOB_TIMER_CANCEL, PRIM_OP_REQUEST); prim->u.timer.timer_id = (intptr_t) timer; -- To view, visit https://gerrit.osmocom.org/10536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4e8db297e816d3d07a46147d5d3bdc0e8fae6c9a Gerrit-Change-Number: 10536 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:35:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:35:20 +0000 Subject: Change in osmocom-bb[master]: Allow lua code to register a fd for reading with the runtime In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10439 ) Change subject: Allow lua code to register a fd for reading with the runtime ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8254bdda1df2f8fe0a5eac894b931e7de5b426df Gerrit-Change-Number: 10439 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:35:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:35:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:35:22 +0000 Subject: Change in osmocom-bb[master]: Allow lua code to register a fd for reading with the runtime In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10439 ) Change subject: Allow lua code to register a fd for reading with the runtime ...................................................................... Allow lua code to register a fd for reading with the runtime To have bi-directional communication we can pass credentials to the registry server and now we can register a callback when the registry is sending data to us. The callback needs to return if the fd should continue to be selected as I found no way to push the userdata as parameter on the stack. Lua code will look like: local host, port = "www.osmocom.org", 80 local tcp = socket.tcp() tcp:connect(host, port); tcp:send("GET / HTTP/1.0\r\n\r\n"); local cb = function() local s, status, partial = tcp:receive() print(s) if status == 'closed' then tcp:close() return 0 end return 1 end local foo = osmo.register_fd(tcp:getfd(), cb) Change-Id: I8254bdda1df2f8fe0a5eac894b931e7de5b426df --- M src/host/layer23/src/mobile/script_lua.c 1 file changed, 103 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/script_lua.c b/src/host/layer23/src/mobile/script_lua.c index 088aab3..924ed6e 100644 --- a/src/host/layer23/src/mobile/script_lua.c +++ b/src/host/layer23/src/mobile/script_lua.c @@ -28,6 +28,7 @@ #include +#include #include #include @@ -37,6 +38,12 @@ int cb_ref; }; +struct fd_userdata { + struct lua_State *state; + struct osmo_fd fd; + int cb_ref; +}; + static char lua_prim_key[] = "osmocom.org-mobile-prim"; static struct mobile_prim_intf *get_primitive(lua_State *L) @@ -435,6 +442,100 @@ return 1; } +static void lua_fd_do_unregister(lua_State *L, struct fd_userdata *fdu) { + /* Unregister the fd and forget about the callback */ + osmo_fd_unregister(&fdu->fd); + if (fdu->cb_ref != LUA_NOREF) { + luaL_unref(L, LUA_REGISTRYINDEX, fdu->cb_ref); + fdu->cb_ref = LUA_NOREF; + } +} + +static int lua_fd_cb(struct osmo_fd *fd, unsigned int what) { + struct fd_userdata *fdu; + lua_State *L; + int cb_ref; + int err; + + if (!fd->data) { + LOGP(DLUA, LOGL_ERROR, + "fd callback for fd(%d) but no lua callback\n", fd->fd); + return 0; + } + + fdu = fd->data; + L = fdu->state; + cb_ref = fdu->cb_ref; + lua_rawgeti(L, LUA_REGISTRYINDEX, cb_ref); + + err = lua_pcall(L, 0, 1, 0); + if (err) { + LOGP(DLUA, LOGL_ERROR, "lua error: %s\n", lua_tostring(L, -1)); + lua_pop(L, 1); + } + + /* Check if we should continue */ + luaL_argcheck(L, lua_isnumber(L, -1), 1, "needs to be a number"); + if (lua_tonumber(L, -1) == 1) + return 0; + + lua_fd_do_unregister(L, fdu); + return 0; +} + +/* Register the fd */ +static int lua_register_fd(lua_State *L) +{ + struct fd_userdata *fdu; + + /* fd, cb */ + luaL_argcheck(L, lua_isnumber(L, -2), 1, "needs to be a filedescriptor"); + luaL_argcheck(L, lua_isfunction(L, -1), 2, "Callback needs to be a function"); + + /* Cretae a table so a user can unregister (and unregister on GC) */ + fdu = lua_newuserdata(L, sizeof(*fdu)); + fdu->state = L; + fdu->fd.fd = -1; + luaL_getmetatable(L, "Fd"); + lua_setmetatable(L, -2); + + /* Set the filedescriptor */ + fdu->fd.fd = (int) lua_tonumber(L, -3); + fdu->fd.cb = lua_fd_cb; + fdu->fd.when = BSC_FD_READ; + fdu->fd.data = fdu; + + /* Assuming that an error here will lead to a GC */ + if (osmo_fd_register(&fdu->fd) != 0) { + fdu->cb_ref = LUA_NOREF; + lua_pushliteral(L, "Can't register the fd"); + lua_error(L); + return 0; + } + + /* Take the callback and keep a reference to it */ + lua_pushvalue(L, -2); + fdu->cb_ref = luaL_ref(L, LUA_REGISTRYINDEX); + + return 1; +} + +static int lua_fd_unregister(lua_State *L) { + struct fd_userdata *fdu; + + luaL_argcheck(L, lua_isuserdata(L, -1), 1, "No userdata"); + fdu = lua_touserdata(L, -1); + + lua_fd_do_unregister(L, fdu); + return 0; +} + + +static const struct luaL_Reg fd_funcs[] = { + { "unregister", lua_fd_unregister }, + { "__gc", lua_fd_unregister }, +}; + static const struct luaL_Reg ms_funcs[] = { { "imsi", lua_ms_imsi }, { "imei", lua_ms_imei }, @@ -452,6 +553,7 @@ static const struct luaL_Reg osmo_funcs[] = { { "timeout", lua_osmo_timeout }, { "unix_passcred", lua_unix_passcred }, + { "register_fd", lua_register_fd }, { "ms", lua_osmo_ms }, { NULL, NULL }, }; @@ -515,6 +617,7 @@ /* Create metatables so we can GC objects... */ create_meta_table(L, "Timer", timer_funcs); create_meta_table(L, "MS", ms_funcs); + create_meta_table(L, "Fd", fd_funcs); /* Remember the primitive pointer... store it in the registry */ lua_pushlightuserdata(L, lua_prim_key); -- To view, visit https://gerrit.osmocom.org/10439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8254bdda1df2f8fe0a5eac894b931e7de5b426df Gerrit-Change-Number: 10439 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:35:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:35:34 +0000 Subject: Change in pysim[master]: tests: add example file for sysmosim-gr1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10572 ) Change subject: tests: add example file for sysmosim-gr1 ...................................................................... tests: add example file for sysmosim-gr1 Change-Id: I36cfa81f9029bfaedd2e802a2d709596dbeb20ab Related: OS#3405 --- A tests/sysmosim-gr1.data.example 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/sysmosim-gr1.data.example b/tests/sysmosim-gr1.data.example new file mode 100644 index 0000000..90d23f8 --- /dev/null +++ b/tests/sysmosim-gr1.data.example @@ -0,0 +1,7 @@ +MCC=001 +MNC=01 +ICCID=1122334455667788990 +KI=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +OPC=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +IMSI=001010000000102 +ADM=DDDDDDDD -- To view, visit https://gerrit.osmocom.org/10572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I36cfa81f9029bfaedd2e802a2d709596dbeb20ab Gerrit-Change-Number: 10572 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:35:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:35:52 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10022 ) Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 24 Aug 2018 10:35:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:37:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:37:02 +0000 Subject: Change in osmo-mgw[master]: fix 3G hack: allow any IP for loopback and 0.0.0.0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10119 ) Change subject: fix 3G hack: allow any IP for loopback and 0.0.0.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib25e6261855eae8ddb8d1c0b8838cc3e30332cf1 Gerrit-Change-Number: 10119 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:37:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:37:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:37:03 +0000 Subject: Change in osmo-mgw[master]: fix 3G hack: allow any IP for loopback and 0.0.0.0 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10119 ) Change subject: fix 3G hack: allow any IP for loopback and 0.0.0.0 ...................................................................... fix 3G hack: allow any IP for loopback and 0.0.0.0 HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP message received. We currently hackishly accomplish that by putting the endpoint in loopback mode and patching over the looped back RTP message to make it look like an ack. We don't know the femto cell's IP address and port until the RAB Assignment Response is received, but the nano3G expects an IuUP Initialization Ack before it even sends the RAB Assignment Response. Hence, if the remote address is 0.0.0.0 and the MGCP port is in loopback mode, allow looping back the packet to any source. None of these are anything near nice, during call setup using a 3G femto cell, we still lack a proper IuUP handling. See OS#2459, OS#1937. This is merely a temporary hack to maintain 3G voice usability in a quick and dirty way. Related: OS#3411 Change-Id: Ib25e6261855eae8ddb8d1c0b8838cc3e30332cf1 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index c85a11d..a73209b 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -872,6 +872,22 @@ { struct mgcp_endpoint *endp; endp = conn->conn->endp; + struct sockaddr_in zero_addr = {}; + + if (memcmp(&zero_addr, &conn->end.addr, sizeof(zero_addr)) == 0 + && conn->conn->mode == MGCP_CONN_LOOPBACK) { + /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP + * message received. We currently hackishly accomplish that by putting the endpoint in + * loopback mode and patching over the looped back RTP message to make it look like an + * ack. We don't know the femto cell's IP address and port until the RAB Assignment + * Response is received, but the nano3G expects an IuUP Initialization Ack before it even + * sends the RAB Assignment Response. Hence, if the remote address is 0.0.0.0 and the + * MGCP port is in loopback mode, allow looping back the packet to any source. */ + LOGP(DRTP, LOGL_ERROR, + "endpoint:0x%x In loopback mode and remote address not set: allowing data from address: %s\n", + ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr)); + return 0; + } /* Note: Check if the inbound RTP data comes from the same host to * which we send our outgoing RTP traffic. */ -- To view, visit https://gerrit.osmocom.org/10119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib25e6261855eae8ddb8d1c0b8838cc3e30332cf1 Gerrit-Change-Number: 10119 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:38:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:38:32 +0000 Subject: Change in osmo-bsc[master]: Fix heap-use-after-free due to OML link destruction In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10578 ) Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Patch Set 2: Code-Review+2 it's ugly (sorry), but it fixes a rather difficult to resolve issue, so let's go ahead with merging this. -- To view, visit https://gerrit.osmocom.org/10578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c Gerrit-Change-Number: 10578 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 10:38:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:38:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:38:36 +0000 Subject: Change in osmo-bsc[master]: Fix heap-use-after-free due to OML link destruction In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10578 ) Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Fix heap-use-after-free due to OML link destruction ipaccess_drop_oml was being called inside an osmo_fd cb context, were -EBADF must be returned if the structure holding the osmo_fd is freed. In the middle of the path (see OS#3495 for path tree) it goes through a signal dispatch, so it's impossible to make sure we return some value to the osmo_fd cb. As a result, it is required to defer dropping the OML Link from current code path and do it through a timer. Fixes following ASan report: 20180822124927913 <0004> abis_nm.c:787 OC=RADIO-CARRIER(02) INST=(00,00,ff): CHANGE ADMINISTRATIVE STATE NACK CAUSE=Message cannot be performed 20180822124927913 <0004> osmo_bsc_main.c:186 Got CHANGE ADMINISTRATIVE STATE NACK going to drop the OML links. 20180822124927913 <0015> bts_ipaccess_nanobts.c:406 (bts=0) Dropping OML link. ... ================================================================= ==17607==ERROR: AddressSanitizer: heap-use-after-free on address 0x62e000060a68 at pc 0x7f5ea8e27086 bp 0x7ffde92b6d80 sp 0x7ffde92b6d78 READ of size 8 at 0x62e000060a68 thread T0 #0 0x7f5ea8e27085 in handle_ts1_write input/ipaccess.c:371 #1 0x7f5ea8e27085 in ipaccess_fd_cb input/ipaccess.c:391 #2 0x7f5ea9147ca8 in osmo_fd_disp_fds libosmocore/src/select.c:217 #3 0x7f5ea9147ca8 in osmo_select_main libosmocore/src/select.c:257 #4 0x555813ab79d6 in main osmo-bsc/osmo_bsc_main.c:922 #5 0x7f5ea76d02e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #6 0x555813ab84e9 in _start (/bin/osmo-bsc+0x34d4e9) Fixes: OS#3495 Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/ipaccess.h M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/osmo_bsc_main.c 4 files changed, 31 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index f85887a..b827d0a 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -923,6 +923,8 @@ struct gsm_e1_subslot oml_e1_link; uint8_t oml_tei; struct e1inp_sign_link *oml_link; + /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ + struct osmo_timer_list oml_drop_link_timer; /* when OML link was established */ time_t uptime; diff --git a/include/osmocom/bsc/ipaccess.h b/include/osmocom/bsc/ipaccess.h index 3d0f612..692e795 100644 --- a/include/osmocom/bsc/ipaccess.h +++ b/include/osmocom/bsc/ipaccess.h @@ -31,6 +31,7 @@ } __attribute__((packed)); void ipaccess_drop_oml(struct gsm_bts *bts); +void ipaccess_drop_oml_deferred(struct gsm_bts *bts); void ipaccess_drop_rsl(struct gsm_bts_trx *trx); struct sdp_header_item { diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 80f7c9c..fec4147 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -166,7 +166,7 @@ enum abis_nm_chan_comb ccomb = abis_nm_chcomb4pchan(ts->pchan_from_config); if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - ipaccess_drop_oml(trx->bts); + ipaccess_drop_oml_deferred(trx->bts); return -1; } abis_nm_chg_adm_state(trx->bts, obj_class, @@ -400,6 +400,9 @@ struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; + /* First of all, remove deferred drop if enabled */ + osmo_timer_del(&bts->oml_drop_link_timer); + if (!bts->oml_link) return; @@ -432,6 +435,29 @@ } } +/*! Callback for \ref ipaccess_drop_oml_deferred_cb. + */ +static void ipaccess_drop_oml_deferred_cb(void *data) +{ + struct gsm_bts *bts = (struct gsm_bts *) data; + ipaccess_drop_oml(bts); +} +/*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in + * current code context. This may be needed if we want to destroy the OML link + * while being called from a lower layer "struct osmo_fd" cb, were it is + * mandatory to return -EBADF if the osmo_fd has been destroyed. In case code + * destroying an OML link is called through an osmo_signal, it becomes + * impossible to return any value, thus deferring the destruction is required. + */ +void ipaccess_drop_oml_deferred(struct gsm_bts *bts) +{ + if (!osmo_timer_pending(&bts->oml_drop_link_timer) && bts->oml_link) { + LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Deferring Drop of OML link.\n", bts->nr); + osmo_timer_setup(&bts->oml_drop_link_timer, ipaccess_drop_oml_deferred_cb, bts); + osmo_timer_schedule(&bts->oml_drop_link_timer, 0, 0); + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 8ff0e8a..0dbe81c 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -191,7 +191,7 @@ } if (is_ipaccess_bts(nack->bts)) - ipaccess_drop_oml(nack->bts); + ipaccess_drop_oml_deferred(nack->bts); return 0; } -- To view, visit https://gerrit.osmocom.org/10578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c Gerrit-Change-Number: 10578 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 10:38:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 10:38:37 +0000 Subject: Change in osmo-bsc[master]: abis_nm_ipaccess_rsl_connect: Log bts and trx nr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10579 ) Change subject: abis_nm_ipaccess_rsl_connect: Log bts and trx nr ...................................................................... abis_nm_ipaccess_rsl_connect: Log bts and trx nr Change-Id: I0c895a44527d5396d3dabb273e000acd86aece1c --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 1092173..4757c72 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2823,8 +2823,8 @@ if (ip == 0) attr_len -= 5; - LOGP(DNM, LOGL_INFO, "IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", - inet_ntoa(ia), port, stream); + LOGP(DNM, LOGL_INFO, "(bts=%d,trx=%d) IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", + trx->bts->nr, trx->nr, inet_ntoa(ia), port, stream); error = abis_nm_ipaccess_msg(trx->bts, NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, -- To view, visit https://gerrit.osmocom.org/10579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0c895a44527d5396d3dabb273e000acd86aece1c Gerrit-Change-Number: 10579 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 11:41:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 24 Aug 2018 11:41:19 +0000 Subject: Change in osmo-bts[master]: fix ip.access dyn TS for osmo-bts-trx Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10598 Change subject: fix ip.access dyn TS for osmo-bts-trx ...................................................................... fix ip.access dyn TS for osmo-bts-trx For enabling PDCH on a dynamic timeslot, PDTCH and PTCCH SAPIs shall be enabled. While osmo-bts-sysmo uses the lchan->type to determine which SAPIs to enable (see lchan_activate() in osmo-bts-sysmo/oml.c: sapis_for_lchan[lchan->type]), the osmo-bts-trx code instead relies on the chan_nr indicating RSL_CHAN_OSMO_PDCH = 0xc0 (see trx_sched_set_lchan() in common/scheduler.c and the PDTCH,PTCCH entries in trx_chan_desc[]). The 0xc0 cbits are a non-standard invention specifically used for only Osmocom style dyn TS, so the chan_nr for IPA style dyn TS will and should never include this cbits pattern. Hence gsm_lchan2chan_nr() correctly always returns the TCH/F equivalent chan_nr for IPA dyn TS. Because trx_chan_desc[] relies on the 0xc0 in the chan_nr to activate the PDTCH and PTCCH SAPIs, internally patch the 0xc0 cbits over the chan_nr in osmo-bts-trx/l1_if.c for channel de-/activation, iff lchan->type == PDTCH. This is technically a convoluted mix-up of the cbits usage. Nevertheless, it is the simplest way to make IPA dyn TS behave the same as Osmocom dyn TS in scheduler.c. Apparently, IPA style dyn TS have never worked for osmo-bts-trx before? Related: OS#3493 Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d --- M src/osmo-bts-trx/l1_if.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/10598/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index a8fb401..23fc196 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -562,6 +562,20 @@ " chan_nr 0x%02x\n", chan_nr); break; } + + /* trx_chan_desc[] in scheduler.c uses the RSL_CHAN_OSMO_PDCH cbits + * (0xc0) to indicate the need for PDTCH and PTCCH SAPI activation. + * However, 0xc0 is a cbits pattern exclusively used for Osmocom style + * dyn TS (a non-standard RSL Chan Activ mod); hence, for IPA style dyn + * TS, the chan_nr will never reflect 0xc0 and we would omit the + * PDTCH,PTTCH SAPIs. To properly de-/activate the PDTCH SAPIs in + * scheduler.c, make sure the 0xc0 cbits are set for de-/activating PDTCH + * lchans, i.e. both Osmocom and IPA style dyn TS. (For Osmocom style dyn + * TS, the chan_nr typically already reflects 0xc0, while it doesn't for + * IPA style.) */ + if (lchan->type == GSM_LCHAN_PDTCH) + chan_nr = RSL_CHAN_OSMO_PDCH | (chan_nr & ~RSL_CHAN_NR_MASK); + /* activate dedicated channel */ trx_sched_set_lchan(&l1h->l1s, chan_nr, LID_DEDIC, 1); /* activate associated channel */ -- To view, visit https://gerrit.osmocom.org/10598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d Gerrit-Change-Number: 10598 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 11:43:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 24 Aug 2018 11:43:34 +0000 Subject: Change in osmo-bts[master]: fix ip.access dyn TS for osmo-bts-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10598 ) Change subject: fix ip.access dyn TS for osmo-bts-trx ...................................................................... Patch Set 1: Verified+1 note https://osmocom.org/issues/3493#note-7 , i.e. that the patch was verified to fix TCH/F_PDCH -- To view, visit https://gerrit.osmocom.org/10598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d Gerrit-Change-Number: 10598 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 11:43:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 12:49:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 24 Aug 2018 12:49:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix SCCPlite BSC tests: send IPA ID ACK, not GET Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10599 Change subject: fix SCCPlite BSC tests: send IPA ID ACK, not GET ...................................................................... fix SCCPlite BSC tests: send IPA ID ACK, not GET >From libosmo-sccp.git Icffda98579e676ab6ca63c9c22cf5d151c4fe95f on, we expect an IPA ID ACK upon first connecting, not an IPA ID GET. This might be specific to the one MSC tested so far, but it's the status quo. Change IPA_Emulation to conform and send the IPA ID ACK upon connecting. This fixes the ttcn3-bsc-tests,SCCPlite suite, broken by above libosmo-sccp commit. Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe --- M library/IPA_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/10599/1 diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index b10a983..c8e0d94 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -566,7 +566,7 @@ g_ipa_conn_id := asp_evt.connOpened.connId; f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP)); if (g_mode == IPA_MODE_SERVER and g_ccm_enabled) { - f_ccm_tx(valueof(ts_IPA_ID_GET)); + f_ccm_tx(valueof(ts_IPA_ACK)); } } -- To view, visit https://gerrit.osmocom.org/10599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe Gerrit-Change-Number: 10599 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 12:57:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 12:57:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix SCCPlite BSC tests: send IPA ID ACK, not GET In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10599 ) Change subject: fix SCCPlite BSC tests: send IPA ID ACK, not GET ...................................................................... Patch Set 1: was this tested from all the test suites that use IPA_Emulation.ttcnpp ? I'm quite sure this has high potential to break other implementations... -- To view, visit https://gerrit.osmocom.org/10599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe Gerrit-Change-Number: 10599 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 24 Aug 2018 12:57:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 13:41:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 24 Aug 2018 13:41:59 +0000 Subject: Change in osmo-bts[master]: fix ip.access dyn TS for osmo-bts-trx In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10598 ) Change subject: fix ip.access dyn TS for osmo-bts-trx ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10598/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10598/1//COMMIT_MSG at 14 PS1, Line 14: common/scheduler.c and the PDTCH,PTCCH entries in trx_chan_desc[]). So, what I understand from your description is that the proper fix would be making osmo-bts-trx determine SAPIs based on lchan->type like it's done in osmo-bts-sysmo. Why don't do that in this patch? How difficult or long is todo it? -- To view, visit https://gerrit.osmocom.org/10598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d Gerrit-Change-Number: 10598 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 24 Aug 2018 13:41:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 13:55:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 24 Aug 2018 13:55:53 +0000 Subject: Change in osmo-bsc[master]: Fix heap-use-after-free due to OML link destruction In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10578 ) Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Patch Set 2: > it's ugly (sorry), I agree. > but it fixes a rather difficult to resolve > issue, so let's go ahead with merging this. I agree. -- To view, visit https://gerrit.osmocom.org/10578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c794c763481c28e8c35dc9b11d27969e16feb3c Gerrit-Change-Number: 10578 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 24 Aug 2018 13:55:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 24 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 24 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#225?= In-Reply-To: <1609743769.86.1535037006922.JavaMail.jenkins@jenkins.osmocom.org> References: <1609743769.86.1535037006922.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1503974533.13.1535123406478.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Aug 24 15:52:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 24 Aug 2018 15:52:01 +0000 Subject: Change in libosmo-abis[master]: ipa: don't crash on missing IPA ID GET message Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10600 Change subject: ipa: don't crash on missing IPA ID GET message ...................................................................... ipa: don't crash on missing IPA ID GET message ipaccess_bts_read_cb() only initializes signalling links if it has received an IPA ID GET message on it, and so far happily accesses the uninitialized sign_links list anyway if it hasn't. Reproduce: simply don't send an IPA ID GET message when connecting to an IPA server run by libosmo-abis, then continue to use the link --> segfault. Fix the segfault: make sure that the e1inp_ts' type has been set, i.e. that e1inp_ts_config_sign() has been called and the sign_links llist is initialized, before calling e1inp_lookup_sign_link() on it. ../../../src/libosmo-abis/src/e1_input.c:511:2: runtime error: member access within null pointer of type 'struct e1inp_sign_link' ../../../src/libosmo-abis/src/e1_input.c:512:11: runtime error: member access within null pointer of type 'struct e1inp_sign_link' ASAN:SIGSEGV ================================================================= ==5702==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000038 (pc 0x7f28a379ea34 sp 0x7ffd7d8933f0 bp 0x62e000000a98 T0) #0 0x7f28a379ea33 in e1inp_lookup_sign_link ../../../src/libosmo-abis/src/e1_input.c:512 #1 0x7f28a37b97d4 in ipaccess_bts_read_cb ../../../src/libosmo-abis/src/input/ipaccess.c:778 #2 0x7f28a37b0277 in ipa_client_read ../../../src/libosmo-abis/src/input/ipa.c:76 #3 0x7f28a37b0277 in ipa_client_fd_cb ../../../src/libosmo-abis/src/input/ipa.c:139 #4 0x7f28a2ac1a34 in osmo_fd_disp_fds ../../../src/libosmocore/src/select.c:217 #5 0x7f28a2ac1a34 in osmo_select_main ../../../src/libosmocore/src/select.c:257 #6 0x444ba3 in bts_main ../../../../src/osmo-bts/src/common/main.c:364 #7 0x7f28a17ddb44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44) #8 0x405e54 (/usr/local/bin/osmo-bts-trx+0x405e54) Related: OS#3498 Change-Id: I2487ca37a0fe9aa56733f66bcad9dcf91fc11144 --- M src/input/ipaccess.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/00/10600/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index ac61e14..cce1654 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -727,12 +727,11 @@ struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; struct e1inp_ts *e1i_ts = NULL; struct e1inp_sign_link *sign_link; + uint8_t msg_type = *(msg->l2h); int ret = 0; /* special handling for IPA CCM. */ if (hh->proto == IPAC_PROTO_IPACCESS) { - uint8_t msg_type = *(msg->l2h); - /* this is a request for identification from the BSC. */ if (msg_type == IPAC_MSGT_ID_GET) { if (!link->line->ops->sign_link_up) { @@ -751,8 +750,6 @@ goto err; if (ret == 1 && hh->proto == IPAC_PROTO_IPACCESS) { - uint8_t msg_type = *(msg->l2h); - if (msg_type == IPAC_MSGT_ID_GET) { sign_link = link->line->ops->sign_link_up(msg, link->line, @@ -774,6 +771,13 @@ OSMO_ASSERT(e1i_ts != NULL); + if (e1i_ts->type == E1INP_TS_TYPE_NONE) { + LOGP(DLINP, LOGL_ERROR, "Signalling link not initialized. Discarding." + " port=%u msg_type=%u\n", link->port, msg_type); + ret = -EIO; + goto err; + } + /* look up for some existing signaling link. */ sign_link = e1inp_lookup_sign_link(e1i_ts, hh->proto, 0); if (sign_link == NULL) { -- To view, visit https://gerrit.osmocom.org/10600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2487ca37a0fe9aa56733f66bcad9dcf91fc11144 Gerrit-Change-Number: 10600 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 16:36:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 24 Aug 2018 16:36:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix SCCPlite BSC tests: send IPA ID ACK, not GET In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10599 ) Change subject: fix SCCPlite BSC tests: send IPA ID ACK, not GET ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe Gerrit-Change-Number: 10599 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 24 Aug 2018 16:36:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 16:37:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 24 Aug 2018 16:37:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix SCCPlite BSC tests: send IPA ID ACK, not GET In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10599 ) Change subject: fix SCCPlite BSC tests: send IPA ID ACK, not GET ...................................................................... Patch Set 2: now only the SCCPlite IPA server sends the IPA ID ACK instead of the GET, and the SCCPlite tests should be fixed while the others are not affected. -- To view, visit https://gerrit.osmocom.org/10599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe Gerrit-Change-Number: 10599 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 24 Aug 2018 16:37:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 16:38:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 24 Aug 2018 16:38:43 +0000 Subject: Change in osmo-bts[master]: cosmetic: abis.c: typo "exixt" Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10601 Change subject: cosmetic: abis.c: typo "exixt" ...................................................................... cosmetic: abis.c: typo "exixt" Change-Id: I678ae63626f05a5bb6d890ff37a09e09739bc104 --- M src/common/abis.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/01/10601/1 diff --git a/src/common/abis.c b/src/common/abis.c index 21240b8..c0bccdb 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -122,7 +122,7 @@ trx_nr); trx = gsm_bts_trx_num(g_bts, trx_nr); if (!trx) { - LOGP(DABIS, LOGL_ERROR, "TRX%d does not exixt!\n", + LOGP(DABIS, LOGL_ERROR, "TRX%d does not exist!\n", trx_nr); break; } -- To view, visit https://gerrit.osmocom.org/10601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I678ae63626f05a5bb6d890ff37a09e09739bc104 Gerrit-Change-Number: 10601 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:45:15 +0000 Subject: Change in osmo-bts[master]: CBCH: Move processing via L1SAP Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10602 Change subject: CBCH: Move processing via L1SAP ...................................................................... CBCH: Move processing via L1SAP for some historical reason, CBCH handling was not using the normal L1SAP boundary. Let's change that and traverse L1SAP just like for e.g. BCCH which is quite similar to CBCH handling. Change-Id: Ibdba4c5e808330f8406f441a97fe0e81170fce97 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/l1_if.c 5 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/10602/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index ad13145..8c90838 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -23,6 +23,7 @@ #define L1SAP_IS_CHAN_RACH(chan_nr) ((chan_nr & 0xf8) == 0x88) #define L1SAP_IS_CHAN_AGCH_PCH(chan_nr) ((chan_nr & 0xf8) == 0x90) #define L1SAP_IS_CHAN_PDCH(chan_nr) ((chan_nr & 0xf8) == 0xc0) +#define L1SAP_IS_CHAN_CBCH(chan_nr) ((chan_nr & 0xf8) == 0xc1) /* rach type from ra */ #define L1SAP_IS_PACKET_RACH(ra) ((ra & 0xf0) == 0x70 && (ra & 0x0f) != 0x0f) diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b8cec0e..a979e42 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -53,6 +53,7 @@ #include #include #include +#include struct gsm_lchan *get_lchan_by_chan_nr(struct gsm_bts_trx *trx, unsigned int chan_nr) @@ -727,6 +728,9 @@ memcpy(p, si, GSM_MACBLOCK_LEN); else memcpy(p, fill_frame, GSM_MACBLOCK_LEN); + } else if (L1SAP_IS_CHAN_CBCH(chan_nr)) { + p = msgb_put(msg, GSM_MACBLOCK_LEN); + bts_cbch_get(trx->bts, p, &g_time); } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */ lchan = get_active_lchan_by_chan_nr(trx, chan_nr); if (!lchan) { diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index e6cdfd4..8bb4909 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include @@ -700,6 +699,9 @@ case GsmL1_Sapi_Bcch: cbits = 0x10; break; + case GsmL1_Sapi_Cbch: + cbits = 0xc1; /* Osmocom extension for CBCH via L1SAP */ + break; case GsmL1_Sapi_Sacch: switch(pchan) { case GSM_PCHAN_TCH_F: @@ -863,10 +865,6 @@ case GsmL1_Sapi_Prach: goto empty_frame; break; - case GsmL1_Sapi_Cbch: - /* get them from bts->si_buf[] */ - bts_cbch_get(bts, msu_param->u8Buffer, &g_time); - break; default: memcpy(msu_param->u8Buffer, fill_frame, GSM_MACBLOCK_LEN); break; diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 91ef07b..8ce8163 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -43,7 +43,6 @@ #include #include #include -#include #include "l1_if.h" #include "l1_oml.h" @@ -357,6 +356,9 @@ case cOCTVC1_GSM_SAPI_ENUM_BCCH: cbits = 0x10; break; + case cOCTVC1_GSM_SAPI_ENUM_CBCH: + cbits = 0xc1; /* Osmocom extension for CBCH via L1SAP */ + break; case cOCTVC1_GSM_SAPI_ENUM_SACCH: switch (pchan) { case GSM_PCHAN_TCH_F: @@ -1017,10 +1019,6 @@ (g_time.t1 << 7) | (g_time.t2 << 2) | (t3p >> 1); data_req->Data.abyDataContent[3] = (t3p & 1); break; - case cOCTVC1_GSM_SAPI_ENUM_CBCH: - rc = bts_cbch_get(bts, data_req->Data.abyDataContent, &g_time); - data_req->Data.ulDataLength = 23; /* GSM MAX BLK SIZE */ - break; case cOCTVC1_GSM_SAPI_ENUM_PRACH: #if 0 /* in case we decide to send an empty frame... */ diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 3adb442..5d52146 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -697,6 +696,9 @@ case GsmL1_Sapi_Bcch: cbits = 0x10; break; + case GsmL1_Sapi_Cbch: + cbits = 0xc1; /* Osmocom extension for CBCH via L1SAP */ + break; case GsmL1_Sapi_Sacch: switch(pchan) { case GSM_PCHAN_TCH_F: @@ -860,10 +862,6 @@ case GsmL1_Sapi_Prach: goto empty_frame; break; - case GsmL1_Sapi_Cbch: - /* get them from bts->si_buf[] */ - bts_cbch_get(bts, msu_param->u8Buffer, &g_time); - break; default: memcpy(msu_param->u8Buffer, fill_frame, GSM_MACBLOCK_LEN); break; -- To view, visit https://gerrit.osmocom.org/10602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdba4c5e808330f8406f441a97fe0e81170fce97 Gerrit-Change-Number: 10602 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:45:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:45:16 +0000 Subject: Change in osmo-bts[master]: CBCH: Implement CBCH support for osmo-bts-{trx, virtual} Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10603 Change subject: CBCH: Implement CBCH support for osmo-bts-{trx,virtual} ...................................................................... CBCH: Implement CBCH support for osmo-bts-{trx,virtual} This patch adds scheduler support for the channel combinations that substitute SDCCH index 2 for a CBCH in either a SDCCH/8 or SDCCH/4. Change-Id: Icc15603079a1709ec094f400a9bcf0008211890f Closes: OS#1617 --- M README.md M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/common/scheduler_mframe.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c 6 files changed, 222 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/10603/1 diff --git a/README.md b/README.md index 43c27b2..38b4bd9 100644 --- a/README.md +++ b/README.md @@ -124,4 +124,3 @@ * TCH/F_PDCH cannel not working as voice (https://osmocom.org/issues/1865) * No BER value delivered to OsmoPCU (https://osmocom.org/issues/1855) * No 11bit RACH support (https://osmocom.org/issues/1854) - * No CBCH support (https://osmocom.org/issues/1617) diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 3fe7978..32d6e91 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -47,6 +47,7 @@ TRXC_SACCH8_7, TRXC_PDTCH, TRXC_PTCCH, + TRXC_CBCH, _TRX_CHAN_MAX }; diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 5c250e4..6d8bf72 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -154,6 +154,7 @@ { 0, TRXC_SACCH8_7, 0x78, LID_SACCH, "SACCH/8(7)", rts_data_fn, tx_data_fn, rx_data_fn, 0 }, { 1, TRXC_PDTCH, 0xc0, LID_DEDIC, "PDTCH", rts_data_fn, tx_pdtch_fn, rx_pdtch_fn, 0 }, { 1, TRXC_PTCCH, 0xc0, LID_DEDIC, "PTCCH", rts_data_fn, tx_data_fn, rx_data_fn, 0 }, + { 0, TRXC_CBCH, 0xc1, LID_DEDIC, "PTCCH", rts_data_fn, tx_data_fn, NULL, 1 }, }; const struct value_string trx_chan_type_names[] = { @@ -195,6 +196,7 @@ OSMO_VALUE_STRING(TRXC_SACCH8_7), OSMO_VALUE_STRING(TRXC_PDTCH), OSMO_VALUE_STRING(TRXC_PTCCH), + OSMO_VALUE_STRING(TRXC_CBCH), OSMO_VALUE_STRING(_TRX_CHAN_MAX), { 0, NULL } }; diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c index ab0b5b6..b78ffa8 100644 --- a/src/common/scheduler_mframe.c +++ b/src/common/scheduler_mframe.c @@ -2,7 +2,7 @@ /* (C) 2013 by Andreas Eversberg * (C) 2015 by Alexander Chemeris - * (C) 2015-2017 by Harald Welte + * (C) 2015-2018 by Harald Welte * * All Rights Reserved * @@ -170,6 +170,113 @@ { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 }, }; +static const struct trx_sched_frame frame_bcch_sdcch4_cbch[102] = { +/* dl_chan dl_bid ul_chan ul_bid */ + { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, + { TRXC_BCCH, 0, TRXC_SDCCH4_3, 2 }, + { TRXC_BCCH, 1, TRXC_SDCCH4_3, 3 }, + { TRXC_BCCH, 2, TRXC_RACH, 0 }, + { TRXC_BCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_IDLE, 0 }, + { TRXC_CCCH, 1, TRXC_IDLE, 1 }, + { TRXC_CCCH, 2, TRXC_IDLE, 2 }, + { TRXC_CCCH, 3, TRXC_IDLE, 3 }, + { TRXC_FCCH, 0, TRXC_SACCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SACCH4_3, 1 }, + { TRXC_CCCH, 0, TRXC_SACCH4_3, 2 }, + { TRXC_CCCH, 1, TRXC_SACCH4_3, 3 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_RACH, 0 }, + { TRXC_CCCH, 1, TRXC_RACH, 0 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 1, TRXC_RACH, 0 }, + { TRXC_CBCH, 2, TRXC_RACH, 0 }, + { TRXC_CBCH, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 1, TRXC_SDCCH4_0, 0 }, + { TRXC_SDCCH4_3, 2, TRXC_SDCCH4_0, 1 }, + { TRXC_SDCCH4_3, 3, TRXC_SDCCH4_0, 2 }, + { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 }, + { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 }, + { TRXC_SACCH4_0, 0, TRXC_SDCCH4_1, 1 }, + { TRXC_SACCH4_0, 1, TRXC_SDCCH4_1, 2 }, + { TRXC_SACCH4_0, 2, TRXC_SDCCH4_1, 3 }, + { TRXC_SACCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SACCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SACCH4_1, 1, TRXC_RACH, 0 }, + { TRXC_SACCH4_1, 2, TRXC_RACH, 1 }, + { TRXC_SACCH4_1, 3, TRXC_RACH, 2 }, + { TRXC_IDLE, 0, TRXC_RACH, 3 }, + + { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 }, + { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 }, + { TRXC_BCCH, 0, TRXC_SDCCH4_3, 2 }, + { TRXC_BCCH, 1, TRXC_SDCCH4_3, 3 }, + { TRXC_BCCH, 2, TRXC_RACH, 0 }, + { TRXC_BCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_SACCH4_0, 0 }, + { TRXC_CCCH, 1, TRXC_SACCH4_0, 1 }, + { TRXC_CCCH, 2, TRXC_SACCH4_0, 2 }, + { TRXC_CCCH, 3, TRXC_SACCH4_0, 3 }, + { TRXC_FCCH, 0, TRXC_SACCH4_1, 0 }, + { TRXC_SCH, 0, TRXC_SACCH4_1, 1 }, + { TRXC_CCCH, 0, TRXC_SACCH4_1, 2 }, + { TRXC_CCCH, 1, TRXC_SACCH4_1, 3 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_CCCH, 0, TRXC_RACH, 0 }, + { TRXC_CCCH, 1, TRXC_RACH, 0 }, + { TRXC_CCCH, 2, TRXC_RACH, 0 }, + { TRXC_CCCH, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_0, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 1, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 2, TRXC_RACH, 0 }, + { TRXC_SDCCH4_1, 3, TRXC_RACH, 0 }, + { TRXC_FCCH, 0, TRXC_RACH, 0 }, + { TRXC_SCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 0, TRXC_RACH, 0 }, + { TRXC_CBCH, 1, TRXC_RACH, 0 }, + { TRXC_CBCH, 2, TRXC_RACH, 0 }, + { TRXC_CBCH, 3, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SDCCH4_3, 1, TRXC_SDCCH4_0, 0 }, + { TRXC_SDCCH4_3, 2, TRXC_SDCCH4_0, 1 }, + { TRXC_SDCCH4_3, 3, TRXC_SDCCH4_0, 2 }, + { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 }, + { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_1, 1 }, + { TRXC_IDLE, 1, TRXC_SDCCH4_1, 2 }, + { TRXC_IDLE, 2, TRXC_SDCCH4_1, 3 }, + { TRXC_IDLE, 3, TRXC_RACH, 0 }, + { TRXC_SACCH4_3, 0, TRXC_RACH, 0 }, + { TRXC_SACCH4_3, 1, TRXC_RACH, 0 }, + { TRXC_SACCH4_3, 2, TRXC_RACH, 1 }, + { TRXC_SACCH4_3, 3, TRXC_RACH, 2 }, + { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 }, +}; + static const struct trx_sched_frame frame_sdcch8[102] = { /* dl_chan dl_bid ul_chan ul_bid */ { TRXC_SDCCH8_0, 0, TRXC_SACCH8_5, 0 }, @@ -277,6 +384,113 @@ { TRXC_IDLE, 0, TRXC_SACCH8_4, 3 }, }; +static const struct trx_sched_frame frame_sdcch8_cbch[102] = { +/* dl_chan dl_bid ul_chan ul_bid */ + { TRXC_SDCCH8_0, 0, TRXC_SACCH8_5, 0 }, + { TRXC_SDCCH8_0, 1, TRXC_SACCH8_5, 1 }, + { TRXC_SDCCH8_0, 2, TRXC_SACCH8_5, 2 }, + { TRXC_SDCCH8_0, 3, TRXC_SACCH8_5, 3 }, + { TRXC_SDCCH8_1, 0, TRXC_SACCH8_6, 0 }, + { TRXC_SDCCH8_1, 1, TRXC_SACCH8_6, 1 }, + { TRXC_SDCCH8_1, 2, TRXC_SACCH8_6, 2 }, + { TRXC_SDCCH8_1, 3, TRXC_SACCH8_6, 3 }, + { TRXC_CBCH, 0, TRXC_SACCH8_7, 0 }, + { TRXC_CBCH, 1, TRXC_SACCH8_7, 1 }, + { TRXC_CBCH, 2, TRXC_SACCH8_7, 2 }, + { TRXC_CBCH, 3, TRXC_SACCH8_7, 3 }, + { TRXC_SDCCH8_3, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 1, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 2, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 3, TRXC_SDCCH8_0, 0 }, + { TRXC_SDCCH8_4, 0, TRXC_SDCCH8_0, 1 }, + { TRXC_SDCCH8_4, 1, TRXC_SDCCH8_0, 2 }, + { TRXC_SDCCH8_4, 2, TRXC_SDCCH8_0, 3 }, + { TRXC_SDCCH8_4, 3, TRXC_SDCCH8_1, 0 }, + { TRXC_SDCCH8_5, 0, TRXC_SDCCH8_1, 1 }, + { TRXC_SDCCH8_5, 1, TRXC_SDCCH8_1, 2 }, + { TRXC_SDCCH8_5, 2, TRXC_SDCCH8_1, 3 }, + { TRXC_SDCCH8_5, 3, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_6, 0, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_6, 1, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_6, 2, TRXC_IDLE, 3 }, + { TRXC_SDCCH8_6, 3, TRXC_SDCCH8_3, 0 }, + { TRXC_SDCCH8_7, 0, TRXC_SDCCH8_3, 1 }, + { TRXC_SDCCH8_7, 1, TRXC_SDCCH8_3, 2 }, + { TRXC_SDCCH8_7, 2, TRXC_SDCCH8_3, 3 }, + { TRXC_SDCCH8_7, 3, TRXC_SDCCH8_4, 0 }, + { TRXC_SACCH8_0, 0, TRXC_SDCCH8_4, 1 }, + { TRXC_SACCH8_0, 1, TRXC_SDCCH8_4, 2 }, + { TRXC_SACCH8_0, 2, TRXC_SDCCH8_4, 3 }, + { TRXC_SACCH8_0, 3, TRXC_SDCCH8_5, 0 }, + { TRXC_SACCH8_1, 0, TRXC_SDCCH8_5, 1 }, + { TRXC_SACCH8_1, 1, TRXC_SDCCH8_5, 2 }, + { TRXC_SACCH8_1, 2, TRXC_SDCCH8_5, 3 }, + { TRXC_SACCH8_1, 3, TRXC_SDCCH8_6, 0 }, + { TRXC_IDLE, 0, TRXC_SDCCH8_6, 1 }, + { TRXC_IDLE, 1, TRXC_SDCCH8_6, 2 }, + { TRXC_IDLE, 2, TRXC_SDCCH8_6, 3 }, + { TRXC_IDLE, 3, TRXC_SDCCH8_7, 0 }, + { TRXC_SACCH8_3, 0, TRXC_SDCCH8_7, 1 }, + { TRXC_SACCH8_3, 1, TRXC_SDCCH8_7, 2 }, + { TRXC_SACCH8_3, 2, TRXC_SDCCH8_7, 3 }, + { TRXC_SACCH8_3, 3, TRXC_SACCH8_0, 0 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 1 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 2 }, + { TRXC_IDLE, 0, TRXC_SACCH8_0, 3 }, + + { TRXC_SDCCH8_0, 0, TRXC_SACCH8_1, 0 }, + { TRXC_SDCCH8_0, 1, TRXC_SACCH8_1, 1 }, + { TRXC_SDCCH8_0, 2, TRXC_SACCH8_1, 2 }, + { TRXC_SDCCH8_0, 3, TRXC_SACCH8_1, 3 }, + { TRXC_SDCCH8_1, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_1, 1, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_1, 2, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_1, 3, TRXC_IDLE, 3 }, + { TRXC_CBCH, 0, TRXC_SACCH8_3, 0 }, + { TRXC_CBCH, 1, TRXC_SACCH8_3, 1 }, + { TRXC_CBCH, 2, TRXC_SACCH8_3, 2 }, + { TRXC_CBCH, 3, TRXC_SACCH8_3, 3 }, + { TRXC_SDCCH8_3, 0, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 1, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 2, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_3, 3, TRXC_SDCCH8_0, 0 }, + { TRXC_SDCCH8_4, 0, TRXC_SDCCH8_0, 1 }, + { TRXC_SDCCH8_4, 1, TRXC_SDCCH8_0, 2 }, + { TRXC_SDCCH8_4, 2, TRXC_SDCCH8_0, 3 }, + { TRXC_SDCCH8_4, 3, TRXC_SDCCH8_1, 0 }, + { TRXC_SDCCH8_5, 0, TRXC_SDCCH8_1, 1 }, + { TRXC_SDCCH8_5, 1, TRXC_SDCCH8_1, 2 }, + { TRXC_SDCCH8_5, 2, TRXC_SDCCH8_1, 3 }, + { TRXC_SDCCH8_5, 3, TRXC_IDLE, 0 }, + { TRXC_SDCCH8_6, 0, TRXC_IDLE, 1 }, + { TRXC_SDCCH8_6, 1, TRXC_IDLE, 2 }, + { TRXC_SDCCH8_6, 2, TRXC_IDLE, 3 }, + { TRXC_SDCCH8_6, 3, TRXC_SDCCH8_3, 0 }, + { TRXC_SDCCH8_7, 0, TRXC_SDCCH8_3, 1 }, + { TRXC_SDCCH8_7, 1, TRXC_SDCCH8_3, 2 }, + { TRXC_SDCCH8_7, 2, TRXC_SDCCH8_3, 3 }, + { TRXC_SDCCH8_7, 3, TRXC_SDCCH8_4, 0 }, + { TRXC_SACCH8_4, 0, TRXC_SDCCH8_4, 1 }, + { TRXC_SACCH8_4, 1, TRXC_SDCCH8_4, 2 }, + { TRXC_SACCH8_4, 2, TRXC_SDCCH8_4, 3 }, + { TRXC_SACCH8_4, 3, TRXC_SDCCH8_5, 0 }, + { TRXC_SACCH8_5, 0, TRXC_SDCCH8_5, 1 }, + { TRXC_SACCH8_5, 1, TRXC_SDCCH8_5, 2 }, + { TRXC_SACCH8_5, 2, TRXC_SDCCH8_5, 3 }, + { TRXC_SACCH8_5, 3, TRXC_SDCCH8_6, 0 }, + { TRXC_SACCH8_6, 0, TRXC_SDCCH8_6, 1 }, + { TRXC_SACCH8_6, 1, TRXC_SDCCH8_6, 2 }, + { TRXC_SACCH8_6, 2, TRXC_SDCCH8_6, 3 }, + { TRXC_SACCH8_6, 3, TRXC_SDCCH8_7, 0 }, + { TRXC_SACCH8_7, 0, TRXC_SDCCH8_7, 1 }, + { TRXC_SACCH8_7, 1, TRXC_SDCCH8_7, 2 }, + { TRXC_SACCH8_7, 2, TRXC_SDCCH8_7, 3 }, + { TRXC_SACCH8_7, 3, TRXC_SACCH8_4, 0 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 1 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 2 }, + { TRXC_IDLE, 0, TRXC_SACCH8_4, 3 }, +}; + static const struct trx_sched_frame frame_tchf_ts0[104] = { /* dl_chan dl_bid ul_chan ul_bid */ { TRXC_TCHF, 0, TRXC_TCHF, 0 }, { TRXC_TCHF, 1, TRXC_TCHF, 1 }, { TRXC_TCHF, 2, TRXC_TCHF, 2 }, { TRXC_TCHF, 3, TRXC_TCHF, 3 }, @@ -749,7 +963,9 @@ { GSM_PCHAN_NONE, 0xff, 0, NULL, "NONE"}, { GSM_PCHAN_CCCH, 0xff, 51, frame_bcch, "BCCH+CCCH" }, { GSM_PCHAN_CCCH_SDCCH4, 0xff, 102, frame_bcch_sdcch4, "BCCH+CCCH+SDCCH/4+SACCH/4" }, + { GSM_PCHAN_CCCH_SDCCH4_CBCH, 0xff, 102, frame_bcch_sdcch4_cbch, "BCCH+CCCH+SDCCH/4+SACCH/4+CBCH" }, { GSM_PCHAN_SDCCH8_SACCH8C, 0xff, 102, frame_sdcch8, "SDCCH/8+SACCH/8" }, + { GSM_PCHAN_SDCCH8_SACCH8C_CBCH,0xff, 102, frame_sdcch8_cbch, "SDCCH/8+SACCH/8+CBCH" }, { GSM_PCHAN_TCH_F, 0x01, 104, frame_tchf_ts0, "TCH/F+SACCH" }, { GSM_PCHAN_TCH_F, 0x02, 104, frame_tchf_ts1, "TCH/F+SACCH" }, { GSM_PCHAN_TCH_F, 0x04, 104, frame_tchf_ts2, "TCH/F+SACCH" }, diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 3b82e42..61610f7 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -111,6 +111,7 @@ gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR); gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR); gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR); + gsm_bts_set_feature(bts, BTS_FEAT_CBCH); bts_model_vty_init(bts); diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index 81fb958..b66a3ff 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -65,6 +65,7 @@ gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_EFR); gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_F_AMR); gsm_bts_set_feature(bts, BTS_FEAT_SPEECH_H_AMR); + gsm_bts_set_feature(bts, BTS_FEAT_CBCH); bts_model_vty_init(bts); -- To view, visit https://gerrit.osmocom.org/10603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icc15603079a1709ec094f400a9bcf0008211890f Gerrit-Change-Number: 10603 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:46:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:46:45 +0000 Subject: Change in osmo-bts[master]: cosmetic: abis.c: typo "exixt" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10601 ) Change subject: cosmetic: abis.c: typo "exixt" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I678ae63626f05a5bb6d890ff37a09e09739bc104 Gerrit-Change-Number: 10601 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 21:46:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:46:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:46:47 +0000 Subject: Change in osmo-bts[master]: cosmetic: abis.c: typo "exixt" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10601 ) Change subject: cosmetic: abis.c: typo "exixt" ...................................................................... cosmetic: abis.c: typo "exixt" Change-Id: I678ae63626f05a5bb6d890ff37a09e09739bc104 --- M src/common/abis.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/abis.c b/src/common/abis.c index 21240b8..c0bccdb 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -122,7 +122,7 @@ trx_nr); trx = gsm_bts_trx_num(g_bts, trx_nr); if (!trx) { - LOGP(DABIS, LOGL_ERROR, "TRX%d does not exixt!\n", + LOGP(DABIS, LOGL_ERROR, "TRX%d does not exist!\n", trx_nr); break; } -- To view, visit https://gerrit.osmocom.org/10601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I678ae63626f05a5bb6d890ff37a09e09739bc104 Gerrit-Change-Number: 10601 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:47:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:47:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix SCCPlite BSC tests: send IPA ID ACK, not GET In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10599 ) Change subject: fix SCCPlite BSC tests: send IPA ID ACK, not GET ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe Gerrit-Change-Number: 10599 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 24 Aug 2018 21:47:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:47:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:47:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: fix SCCPlite BSC tests: send IPA ID ACK, not GET In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10599 ) Change subject: fix SCCPlite BSC tests: send IPA ID ACK, not GET ...................................................................... fix SCCPlite BSC tests: send IPA ID ACK, not GET >From libosmo-sccp.git Icffda98579e676ab6ca63c9c22cf5d151c4fe95f on, we expect an IPA ID ACK upon first connecting, not an IPA ID GET. This might be specific to the one MSC tested so far, but it's the status quo. Make the IPA server in IPA_Emulation configurable, to conform and send the IPA ID ACK upon connecting. This fixes the ttcn3-bsc-tests,SCCPlite suite, broken by above libosmo-sccp commit. For other IPA clients, it is so far required to send the IPA ID GET, so only configure the SCCPlite server in BSSAP_Adapter.ttcn to send IPA ID ACK, and leave the others unchanged. Related: OS#3500 OS#3498 Related: Icffda98579e676ab6ca63c9c22cf5d151c4fe95f (libosmo-sccp) Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe --- M library/BSSAP_Adapter.ttcn M library/IPA_Emulation.ttcnpp 2 files changed, 20 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index ada66d2..cebdffe 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -107,7 +107,8 @@ connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); ba.vc_WAIT.start(IPA_Emulation.waiter_main()); ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr, - cfg.sctp_addr.local_sctp_port)); + cfg.sctp_addr.local_sctp_port, + true, IPA_INIT_SEND_IPA_ID_ACK)); /* wait until we received an IPA CCM ID_ACK */ ba.vc_WAIT.done; disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index b10a983..5c385e6 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -51,6 +51,11 @@ IPA_MODE_SERVER } +type enumerated IpaInitBehavior { + IPA_INIT_SEND_IPA_ID_GET, + IPA_INIT_SEND_IPA_ID_ACK +} + type record ASP_IPA_Unitdata { IpaStreamId streamId, IpaExtStreamId streamIdExt optional, @@ -165,6 +170,7 @@ var IpaMode g_mode; var boolean g_ccm_enabled; + var IpaInitBehavior g_init_behavior; var IPA_CCM_Parameters g_ccm_pars := c_IPA_default_ccm_pars; } @@ -425,9 +431,12 @@ /* main function to use for a server-side IPA implementation */ function main_server(charstring local_host, IPL4asp_Types.PortNumber local_port, - boolean ccm_enabled := true) runs on IPA_Emulation_CT { + boolean ccm_enabled := true, + IpaInitBehavior init_behavior := IPA_INIT_SEND_IPA_ID_GET) +runs on IPA_Emulation_CT { g_mode := IPA_MODE_SERVER; g_ccm_enabled := ccm_enabled; + g_init_behavior := init_behavior; f_bind(local_host, local_port); ScanEvents(); } @@ -566,7 +575,14 @@ g_ipa_conn_id := asp_evt.connOpened.connId; f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP)); if (g_mode == IPA_MODE_SERVER and g_ccm_enabled) { - f_ccm_tx(valueof(ts_IPA_ID_GET)); + select (g_init_behavior) { + case (IPA_INIT_SEND_IPA_ID_GET) { + f_ccm_tx(valueof(ts_IPA_ID_GET)); + } + case (IPA_INIT_SEND_IPA_ID_ACK) { + f_ccm_tx(valueof(ts_IPA_ACK)); + } + } } } -- To view, visit https://gerrit.osmocom.org/10599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe Gerrit-Change-Number: 10599 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:47:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:47:54 +0000 Subject: Change in libosmo-abis[master]: ipa: don't crash on missing IPA ID GET message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10600 ) Change subject: ipa: don't crash on missing IPA ID GET message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2487ca37a0fe9aa56733f66bcad9dcf91fc11144 Gerrit-Change-Number: 10600 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 24 Aug 2018 21:47:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 24 21:47:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 24 Aug 2018 21:47:56 +0000 Subject: Change in libosmo-abis[master]: ipa: don't crash on missing IPA ID GET message In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10600 ) Change subject: ipa: don't crash on missing IPA ID GET message ...................................................................... ipa: don't crash on missing IPA ID GET message ipaccess_bts_read_cb() only initializes signalling links if it has received an IPA ID GET message on it, and so far happily accesses the uninitialized sign_links list anyway if it hasn't. Reproduce: simply don't send an IPA ID GET message when connecting to an IPA server run by libosmo-abis, then continue to use the link --> segfault. Fix the segfault: make sure that the e1inp_ts' type has been set, i.e. that e1inp_ts_config_sign() has been called and the sign_links llist is initialized, before calling e1inp_lookup_sign_link() on it. ../../../src/libosmo-abis/src/e1_input.c:511:2: runtime error: member access within null pointer of type 'struct e1inp_sign_link' ../../../src/libosmo-abis/src/e1_input.c:512:11: runtime error: member access within null pointer of type 'struct e1inp_sign_link' ASAN:SIGSEGV ================================================================= ==5702==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000038 (pc 0x7f28a379ea34 sp 0x7ffd7d8933f0 bp 0x62e000000a98 T0) #0 0x7f28a379ea33 in e1inp_lookup_sign_link ../../../src/libosmo-abis/src/e1_input.c:512 #1 0x7f28a37b97d4 in ipaccess_bts_read_cb ../../../src/libosmo-abis/src/input/ipaccess.c:778 #2 0x7f28a37b0277 in ipa_client_read ../../../src/libosmo-abis/src/input/ipa.c:76 #3 0x7f28a37b0277 in ipa_client_fd_cb ../../../src/libosmo-abis/src/input/ipa.c:139 #4 0x7f28a2ac1a34 in osmo_fd_disp_fds ../../../src/libosmocore/src/select.c:217 #5 0x7f28a2ac1a34 in osmo_select_main ../../../src/libosmocore/src/select.c:257 #6 0x444ba3 in bts_main ../../../../src/osmo-bts/src/common/main.c:364 #7 0x7f28a17ddb44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44) #8 0x405e54 (/usr/local/bin/osmo-bts-trx+0x405e54) Related: OS#3498 Change-Id: I2487ca37a0fe9aa56733f66bcad9dcf91fc11144 --- M src/input/ipaccess.c 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index ac61e14..cce1654 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -727,12 +727,11 @@ struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; struct e1inp_ts *e1i_ts = NULL; struct e1inp_sign_link *sign_link; + uint8_t msg_type = *(msg->l2h); int ret = 0; /* special handling for IPA CCM. */ if (hh->proto == IPAC_PROTO_IPACCESS) { - uint8_t msg_type = *(msg->l2h); - /* this is a request for identification from the BSC. */ if (msg_type == IPAC_MSGT_ID_GET) { if (!link->line->ops->sign_link_up) { @@ -751,8 +750,6 @@ goto err; if (ret == 1 && hh->proto == IPAC_PROTO_IPACCESS) { - uint8_t msg_type = *(msg->l2h); - if (msg_type == IPAC_MSGT_ID_GET) { sign_link = link->line->ops->sign_link_up(msg, link->line, @@ -774,6 +771,13 @@ OSMO_ASSERT(e1i_ts != NULL); + if (e1i_ts->type == E1INP_TS_TYPE_NONE) { + LOGP(DLINP, LOGL_ERROR, "Signalling link not initialized. Discarding." + " port=%u msg_type=%u\n", link->port, msg_type); + ret = -EIO; + goto err; + } + /* look up for some existing signaling link. */ sign_link = e1inp_lookup_sign_link(e1i_ts, hh->proto, 0); if (sign_link == NULL) { -- To view, visit https://gerrit.osmocom.org/10600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2487ca37a0fe9aa56733f66bcad9dcf91fc11144 Gerrit-Change-Number: 10600 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 09:21:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 25 Aug 2018 09:21:44 +0000 Subject: Change in osmo-gsm-manuals[master]: WIP: Add early draft message sequence charts for GSUP based SMS Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10604 Change subject: WIP: Add early draft message sequence charts for GSUP based SMS ...................................................................... WIP: Add early draft message sequence charts for GSUP based SMS Change-Id: I9a0536f285f98f24fec4d7318f1923782ed2e18c --- A common/chapters/gsup_mo_sms.msc A common/chapters/gsup_mt_sms.msc 2 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/04/10604/1 diff --git a/common/chapters/gsup_mo_sms.msc b/common/chapters/gsup_mo_sms.msc new file mode 100644 index 0000000..b56e1fa --- /dev/null +++ b/common/chapters/gsup_mo_sms.msc @@ -0,0 +1,16 @@ +msc { + hscale="2"; + ms [label="MS"], vlr [label="MSC/VLR"], hlr [label="HLR"], smsc [label="SMSC"]; + + ms <-> vlr [label="Establishment, Auth, Ciph, ..."]; + ...; + ms -> vlr [label="CP-DATA(RP-DATA(SMS-SUBMIT))"]; + ms <- vlr [label="CP-ACK"]; + vlr -> hlr [label="GSUP MO-Forward-SM (OA, DA, UI)"]; + hlr box hlr [label="route based on DA\n(SMSC address)"]; + hlr -> smsc [label="GSUP MO-Forward-SM (OA, DA, UI)"]; + hlr <- smsc [label="GSUP MO-Forward-SM ACK"]; + vlr <- hlr [label="GSUP MO-Forward-SM ACK"]; + ms <- vlr [label="CP-DATA(RP-ACK)"]; + ms -> vlr [label="CP-ACK"]; +} diff --git a/common/chapters/gsup_mt_sms.msc b/common/chapters/gsup_mt_sms.msc new file mode 100644 index 0000000..250b8e7 --- /dev/null +++ b/common/chapters/gsup_mt_sms.msc @@ -0,0 +1,22 @@ +msc { + hscale="3"; + ms [label="MS"], vlr [label="MSC/VLR"], hlr [label="HLR"], smsc [label="SMSC"]; + + hlr <- smsc [label="GSUP SRI-for-SM (MSISDN)"]; + hlr box hlr [label="Lookup DB based on MSISDN\nReturn IMSI + VLR Address"]; + hlr -> smsc [label="GSUP SRI-for-SM ACK (IMSI, VLR-Address)"]; + ...; + smsc box smsc [label="In real MAP, the dialogue below\nwould go directly to the VLR"]; + hlr <- smsc [label="GSUP MT-Forward-SM (VLR-Address, DA=IMSI, OA=SMSC, UI, MMS)"]; + hlr box hlr [label="route based on VLR-Address"]; + vlr <- hlr [label="GSUP MT-Forward-SM (VLR-Address, DA=IMSI, OA=SMSC, UI, MMS)"]; + ms <- vlr [label="Paging"]; + ms <-> vlr [label="Establishment, Auth, Ciph, ..."]; + ...; + ms <- vlr [label="CP-DATA(RP-DATA(SMS-DELIVER))"]; + ms -> vlr [label="CP-ACK"]; + ms -> vlr [label="CP-DATA(RP-ACK)"]; + vlr -> hlr [label="GSUP MT-Forward-SM ACK"]; + hlr -> smsc [label="GSUP MT-Forward-SM ACK"]; + ms <- vlr [label="CP-ACK"]; +} -- To view, visit https://gerrit.osmocom.org/10604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9a0536f285f98f24fec4d7318f1923782ed2e18c Gerrit-Change-Number: 10604 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 14:22:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 14:22:09 +0000 Subject: Change in libosmo-abis[master]: ipa: don't crash on missing IPA ID GET message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10600 ) Change subject: ipa: don't crash on missing IPA ID GET message ...................................................................... Patch Set 1: commit log should have said: "Reproduce: use libosmo-abis IPA client to connect to an IPA server that simply doesn't send an IPA ID GET, but any other message --> segfault" -- To view, visit https://gerrit.osmocom.org/10600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2487ca37a0fe9aa56733f66bcad9dcf91fc11144 Gerrit-Change-Number: 10600 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 25 Aug 2018 14:22:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 14:23:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 14:23:10 +0000 Subject: Change in osmo-mgw[master]: cosmetic: drop code dup in mgcp_client_fsm.c CRCX In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10584 ) Change subject: cosmetic: drop code dup in mgcp_client_fsm.c CRCX ...................................................................... cosmetic: drop code dup in mgcp_client_fsm.c CRCX Both make_crcx_msg_bind() and make_crcx_msg_bind_connect() were mostly identical. Rather, compose the CRCX bits in one common function and just add the audio bits in another. Prepares cosmetically for adding X-Osmo-IGN header. Change-Id: Ie51cc86e90ffeca5b66bcb8f6db0d389241abe57 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 19 insertions(+), 38 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index a0dc0fb..770db5e 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -104,48 +104,28 @@ {0, NULL} }; -static struct msgb *make_crcx_msg_bind(struct mgcp_ctx *mgcp_ctx) +static void make_crcx_msg(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info) { - struct mgcp_msg mgcp_msg; - - mgcp_msg = (struct mgcp_msg) { + *mgcp_msg = (struct mgcp_msg) { .verb = MGCP_VERB_CRCX, - .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), - .call_id = mgcp_ctx->conn_peer_local.call_id, + .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID + | MGCP_MSG_PRESENCE_CONN_MODE), + .call_id = info->call_id, .conn_mode = MGCP_CONN_RECV_ONLY, - .ptime = mgcp_ctx->conn_peer_local.ptime, - .codecs_len = mgcp_ctx->conn_peer_local.codecs_len, - .ptmap_len = mgcp_ctx->conn_peer_local.ptmap_len + .ptime = info->ptime, + .codecs_len = info->codecs_len, + .ptmap_len = info->ptmap_len }; - osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->conn_peer_local.endpoint, MGCP_ENDPOINT_MAXLEN); - memcpy(mgcp_msg.codecs, mgcp_ctx->conn_peer_local.codecs, sizeof(mgcp_msg.codecs)); - memcpy(mgcp_msg.ptmap, mgcp_ctx->conn_peer_local.ptmap, sizeof(mgcp_msg.ptmap)); - - return mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); + osmo_strlcpy(mgcp_msg->endpoint, info->endpoint, MGCP_ENDPOINT_MAXLEN); + memcpy(mgcp_msg->codecs, info->codecs, sizeof(mgcp_msg->codecs)); + memcpy(mgcp_msg->ptmap, info->ptmap, sizeof(mgcp_msg->ptmap)); } -static struct msgb *make_crcx_msg_bind_connect(struct mgcp_ctx *mgcp_ctx) +static void add_audio(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info) { - struct mgcp_msg mgcp_msg; - - mgcp_msg = (struct mgcp_msg) { - .verb = MGCP_VERB_CRCX, - .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | - MGCP_MSG_PRESENCE_CONN_MODE | MGCP_MSG_PRESENCE_AUDIO_IP | - MGCP_MSG_PRESENCE_AUDIO_PORT), - .call_id = mgcp_ctx->conn_peer_local.call_id, - .conn_mode = MGCP_CONN_RECV_SEND, - .audio_ip = mgcp_ctx->conn_peer_local.addr, - .audio_port = mgcp_ctx->conn_peer_local.port, - .ptime = mgcp_ctx->conn_peer_local.ptime, - .codecs_len = mgcp_ctx->conn_peer_local.codecs_len, - .ptmap_len = mgcp_ctx->conn_peer_local.ptmap_len - }; - osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->conn_peer_local.endpoint, MGCP_ENDPOINT_MAXLEN); - memcpy(mgcp_msg.codecs, mgcp_ctx->conn_peer_local.codecs, sizeof(mgcp_msg.codecs)); - memcpy(mgcp_msg.ptmap, mgcp_ctx->conn_peer_local.ptmap, sizeof(mgcp_msg.ptmap)); - - return mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); + mgcp_msg->presence |= MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT; + mgcp_msg->audio_ip = info->addr; + mgcp_msg->audio_port = info->port; } static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx) @@ -197,6 +177,7 @@ { struct mgcp_ctx *mgcp_ctx = data; struct mgcp_client *mgcp; + struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; @@ -209,10 +190,10 @@ LOGPFSML(fi, LOGL_DEBUG, "MGW/CRCX: creating connection on MGW endpoint:%s...\n", mgcp_ctx->conn_peer_local.endpoint); + make_crcx_msg(&mgcp_msg, &mgcp_ctx->conn_peer_local); if (mgcp_ctx->conn_peer_local.port) - msg = make_crcx_msg_bind_connect(mgcp_ctx); - else - msg = make_crcx_msg_bind(mgcp_ctx); + add_audio(&mgcp_msg, &mgcp_ctx->conn_peer_local); + msg = mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); OSMO_ASSERT(msg); mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg); -- To view, visit https://gerrit.osmocom.org/10584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie51cc86e90ffeca5b66bcb8f6db0d389241abe57 Gerrit-Change-Number: 10584 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 14:39:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 14:39:36 +0000 Subject: Change in osmo-bts[master]: fix ip.access dyn TS for osmo-bts-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10598 ) Change subject: fix ip.access dyn TS for osmo-bts-trx ...................................................................... Patch Set 1: to change it: * change structure of trx_chan_desc[]. It relies on chan_nr to indicate PDCH-ness or not and adjust all users -- probably not. * OR special-case dyn ts instead of using trx_chan_desc. Make sure all users that need this do so, hopefully only trx_sched_set_lchan()? * obtain or pass in the lchan->type to trx_sched_set_lchan(), I think it's possible with get_lchan_by_chan_nr(l1t->trx, chan_nr) IMHO it's ok to use the slightly unusual cbits internally: it's less complex to rule out side effects. I can spend some more time to try and solve it with lchan->type, if anyone insists. -- To view, visit https://gerrit.osmocom.org/10598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d Gerrit-Change-Number: 10598 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 25 Aug 2018 14:39:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 14:48:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 14:48:08 +0000 Subject: Change in osmo-mgw[master]: add X-Osmo-IGN MGCP header to ignore CallID In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10585 to look at the new patch set (#2). Change subject: add X-Osmo-IGN MGCP header to ignore CallID ...................................................................... add X-Osmo-IGN MGCP header to ignore CallID The format is CRCX ... C: ... M: ... X-Osmo-IGN: C So far the only ignorable element is C, i.e. the CallID. Any other items may be added in the future. (I initially intended to also add '@' to ignore the endpoint name's domain part, but in the osmo-mgw code base the domain part is verified long before any additional headers are even parsed, so sparing that refactoring for now.) The intention is that osmo-bsc will issue "X-Osmo-IGN: C" for all SCCPlite calls, because we are unable to retrieve the CallID that the MSC sends to osmo-mgw for the network side of the endpoint. Testing with a specific SCCPlite MSC, I actually observe that all CallIDs are 1, even for concurrent calls. So, an alternative hacky solution would have been to always pass CallID == 1 for SCCPlite connections from osmo-bsc. Related: I257ad574d8060fef19afce9798bd8a5a7f8c99fe (osmo-bsc) Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 --- M include/osmocom/mgcp/mgcp_common.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c M src/libosmo-mgcp-client/mgcp_client_vty.c M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 13 files changed, 132 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/85/10585/2 -- To view, visit https://gerrit.osmocom.org/10585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 Gerrit-Change-Number: 10585 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 14:50:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 14:50:33 +0000 Subject: Change in osmo-gsm-tester[master]: Add channel_allocator cfg attr to bts resources In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10582 ) Change subject: Add channel_allocator cfg attr to bts resources ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0 Gerrit-Change-Number: 10582 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 25 Aug 2018 14:50:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 14:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 14:58:23 +0000 Subject: Change in libosmocore[master]: utils: add osmo-gsmtap-sink, simplistic UDP receiver In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/6516 ) Change subject: utils: add osmo-gsmtap-sink, simplistic UDP receiver ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/6516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I85499af06bc5a0d757f6071779075e57bb435930 Gerrit-Change-Number: 6516 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 15:00:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 15:00:30 +0000 Subject: Change in osmo-bts[master]: jenkins: enable -Werror everywhere In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/7267 ) Change subject: jenkins: enable -Werror everywhere ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/7267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I6b6e11d1b10e3940488404074e1e9347a90e88a5 Gerrit-Change-Number: 7267 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 15:08:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 15:08:34 +0000 Subject: Change in osmo-bsc[master]: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10586 ) Change subject: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10586/1/src/osmo-bsc/osmo_bsc_vty.c File src/osmo-bsc/osmo_bsc_vty.c: https://gerrit.osmocom.org/#/c/10586/1/src/osmo-bsc/osmo_bsc_vty.c at 687 PS1, Line 687: " associated with this MSC\n" > it might make sense to add "(likely required in SCCPlite based A)" to make it easier to figure out w [?] It's already enabled by default for all SCCPlite MSCs. Will tweak the doc. -- To view, visit https://gerrit.osmocom.org/10586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe Gerrit-Change-Number: 10586 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 25 Aug 2018 15:08:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 15:08:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 25 Aug 2018 15:08:42 +0000 Subject: Change in osmo-bsc[master]: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10586 to look at the new patch set (#2). Change subject: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default ...................................................................... MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default Use libosmo-mgcp-client's new X-Osmo-IGN header to indicate that CallIDs are allowed to mismatch. Add VTY commands 'msc' / 'mgw x-osmo-ign call-id' and 'no mgw x-osmo-ign' to switch this behavior explicitly. For SCCPlite MSCs, unless a specific config was issued, always send 'X-Osmo-IGN: C' by default, to ignore CallID mismatches. Depends: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 (osmo-mgw) Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 56 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/10586/2 -- To view, visit https://gerrit.osmocom.org/10586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe Gerrit-Change-Number: 10586 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Aug 25 15:13:28 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 25 Aug 2018 15:13:28 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#226?= In-Reply-To: <1503974533.13.1535123406478.JavaMail.jenkins@jenkins.osmocom.org> References: <1503974533.13.1535123406478.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <18179886.20.1535210008501.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Aug 25 19:31:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 25 Aug 2018 19:31:01 +0000 Subject: Change in osmo-gsm-tester[master]: Add channel_allocator cfg attr to bts resources In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10582 ) Change subject: Add channel_allocator cfg attr to bts resources ...................................................................... Add channel_allocator cfg attr to bts resources Change-Id: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0 --- M example/defaults.conf M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 4 files changed, 10 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/defaults.conf b/example/defaults.conf index f7bd1b1..73188d5 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -28,6 +28,7 @@ base_station_id_code: 63 stream_id: 255 osmobsc_bts_type: sysmobts + channel_allocator: ascending num_trx: 1 max_trx: 1 trx_list: diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 5204b61..e4e2f9d 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -58,6 +58,7 @@ 'bts[].launch_trx': schema.BOOL_STR, 'bts[].direct_pcu': schema.BOOL_STR, 'bts[].ciphers[]': schema.CIPHER, + 'bts[].channel_allocator': schema.CHAN_ALLOCATOR, 'bts[].num_trx': schema.UINT, 'bts[].max_trx': schema.UINT, 'bts[].trx_list[].addr': schema.IPV4, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 1473ad7..4a15bcd 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -105,6 +105,11 @@ return raise ValueError('Unknown Physical channel config: %r' % val) +def channel_allocator(val): + if val in ('ascending', 'descending'): + return + raise ValueError('Unknown Channel Allocator Policy %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -120,6 +125,7 @@ CIPHER = 'cipher' MODEM_FEATURE = 'modem_feature' PHY_CHAN = 'chan' +CHAN_ALLOCATOR = 'chan_allocator' SCHEMA_TYPES = { INT: int, @@ -137,6 +143,7 @@ CIPHER: cipher, MODEM_FEATURE: modem_feature, PHY_CHAN: phy_channel_config, + CHAN_ALLOCATOR: channel_allocator, } def validate(config, schema): diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 18303b6..edcf33f 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -49,7 +49,7 @@ ms max power 33 cell reselection hysteresis 4 rxlev access min 0 - channel allocator ascending + channel allocator ${bts.channel_allocator} rach tx integer 9 rach max transmission 7 % if bsc.net.get('rsl_ip', False): -- To view, visit https://gerrit.osmocom.org/10582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0 Gerrit-Change-Number: 10582 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Aug 25 19:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 25 Aug 2018 19:31:04 +0000 Subject: Change in osmo-gsm-tester[master]: Add testsuite + scenarios to test nanoBTS multiTRX In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10583 ) Change subject: Add testsuite + scenarios to test nanoBTS multiTRX ...................................................................... Add testsuite + scenarios to test nanoBTS multiTRX Currently only 2 nanoBTS in the 900 band are attached together as a multiTRX setup. We thus set num_trx to 2 and set channel allocator descending to force the BTS to use the 2nd TRX when allocating channels. Change-Id: I12e1bcb047c4efac5693cf725739e0ce2e0532ee --- M example/default-suites.conf M example/defaults.conf A example/scenarios/mod-bts0-chanallocdescend.conf 3 files changed, 18 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 7ff8470..8d692fa 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -53,8 +53,10 @@ - voice:nanobts+band-900+mod-bts0-ts-tchf - voice:nanobts+band-900+mod-bts0-ts-tchh - voice:nanobts+band-900+mod-bts0-dynts-ipa +- voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 - gprs:nanobts+band-900+mod-bts0-dynts-ipa +- gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - smpp - aoip_smpp - aoip_encryption diff --git a/example/defaults.conf b/example/defaults.conf index 73188d5..61b09fb 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -54,11 +54,22 @@ - phys_chan_config: TCH/F - phys_chan_config: TCH/F - phys_chan_config: TCH/F - - phys_chan_config: TCH/F - - phys_chan_config: TCH/F + - phys_chan_config: PDCH + - phys_chan_config: PDCH osmo_bts_octphy: max_trx: 2 nanobts: max_trx: 2 + trx_list: + - {} + - timeslot_list: + - {} + - {} + - {} + - {} + - {} + - {} + - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0. + - phys_chan_config: TCH/F diff --git a/example/scenarios/mod-bts0-chanallocdescend.conf b/example/scenarios/mod-bts0-chanallocdescend.conf new file mode 100644 index 0000000..78cd02c --- /dev/null +++ b/example/scenarios/mod-bts0-chanallocdescend.conf @@ -0,0 +1,3 @@ +modifiers: + bts: + - channel_allocator: descending -- To view, visit https://gerrit.osmocom.org/10583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I12e1bcb047c4efac5693cf725739e0ce2e0532ee Gerrit-Change-Number: 10583 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 07:55:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 07:55:16 +0000 Subject: Change in simtrace2[master]: host: Fix "make clean": remove simtrace2-sniff Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10605 Change subject: host: Fix "make clean": remove simtrace2-sniff ...................................................................... host: Fix "make clean": remove simtrace2-sniff Change-Id: Ib233b6a4b3976286196da95036cadcf2d3382f77 --- M host/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/05/10605/1 diff --git a/host/Makefile b/host/Makefile index 50497c4..02f2a8f 100644 --- a/host/Makefile +++ b/host/Makefile @@ -19,4 +19,4 @@ $(CC) $(CFLAGS) `pkg-config --cflags libusb-1.0 libosmocore` -o $@ -c $^ clean: - @rm -f simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list *.o + @rm -f simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff *.o -- To view, visit https://gerrit.osmocom.org/10605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib233b6a4b3976286196da95036cadcf2d3382f77 Gerrit-Change-Number: 10605 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 07:55:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 07:55:18 +0000 Subject: Change in simtrace2[master]: Makefiles: Add "make install" target Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10606 Change subject: Makefiles: Add "make install" target ...................................................................... Makefiles: Add "make install" target Change-Id: Ic6835ce55930c60f909e140878c4abab8628e077 --- M firmware/Makefile M host/Makefile 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/06/10606/1 diff --git a/firmware/Makefile b/firmware/Makefile index ca22bdd..48ae18b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -234,3 +234,7 @@ clean: -rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p` + +install: + mkdir -p $(DESTDIR)/usr/share/simtrace2 + cp $(BIN)/*.bin $(DESTDIR)/usr/share/simtrace2 diff --git a/host/Makefile b/host/Makefile index 02f2a8f..a7ef582 100644 --- a/host/Makefile +++ b/host/Makefile @@ -1,7 +1,9 @@ LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore CFLAGS=-Wall -g -all: simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff +APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff + +all: $(APPS) simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o $(CC) -o $@ $^ $(LDFLAGS) -losmosim @@ -19,4 +21,8 @@ $(CC) $(CFLAGS) `pkg-config --cflags libusb-1.0 libosmocore` -o $@ -c $^ clean: - @rm -f simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff *.o + @rm -f *.o $(APPS) + +install: $(APPS) + mkdir -p $(DESTDIR)/usr/local/bin + cp $(APPS) $(DESTDIR)/usr/local/bin/ -- To view, visit https://gerrit.osmocom.org/10606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6835ce55930c60f909e140878c4abab8628e077 Gerrit-Change-Number: 10606 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 07:55:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 07:55:18 +0000 Subject: Change in simtrace2[master]: add master Makefile to build firmware and host tools Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10607 Change subject: add master Makefile to build firmware and host tools ...................................................................... add master Makefile to build firmware and host tools Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af --- A Makefile 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/07/10607/1 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..013f060 --- /dev/null +++ b/Makefile @@ -0,0 +1,27 @@ +all: fw utils + +define RULES +fw-$(1)-$(2): + make -C firmware BOARD=$(1) APP=$(2) +fw-$(1)-$(2)-clean: + make -C firmware BOARD=$(1) APP=$(2) clean +endef + +$(eval $(call RULES,simtrace,dfu)) +$(eval $(call RULES,simtrace,trace)) +$(eval $(call RULES,simtrace,cardem)) +$(eval $(call RULES,qmod,dfu)) +$(eval $(call RULES,qmod,cardem)) + +fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw-qmod-dfu-clean fw-qmod-cardem-clean +fw: fw-clean fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem + +utils: + make -C host + +clean: fw-clean + make -C host clean + +install: fw + make -C firmware install + make -C host install -- To view, visit https://gerrit.osmocom.org/10607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af Gerrit-Change-Number: 10607 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 07:55:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 07:55:19 +0000 Subject: Change in simtrace2[master]: firmware: Enable -Wformat and resolve all related compiler warnings Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10608 Change subject: firmware: Enable -Wformat and resolve all related compiler warnings ...................................................................... firmware: Enable -Wformat and resolve all related compiler warnings There have been tons of format-string related bugs in our code which we never discovered due to disabling -Wformat. Let's fix that. Change-Id: I5ec466361bcc526fac1f4897673264ee5af3458b --- M firmware/Makefile M firmware/apps/cardem/main.c M firmware/apps/trace/main.c M firmware/libboard/common/source/boardver_adc.c M firmware/libboard/qmod/source/board_qmod.c M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/iso7816_4.c M firmware/libcommon/source/mode_cardemu.c M firmware/libcommon/source/pseudo_talloc.c M firmware/libcommon/source/simtrace_iso7816.c M firmware/libcommon/source/sniffer.c M firmware/libcommon/source/stdio.c 13 files changed, 24 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/08/10608/1 diff --git a/firmware/Makefile b/firmware/Makefile index 48ae18b..25d67d7 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -141,13 +141,12 @@ INCLUDES += -Isrc_simtrace -Iinclude INCLUDES += -Iapps/$(APP) -CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2 +CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal #-Wundef CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings CFLAGS += -Waggregate-return #-Wsign-compare -CFLAGS += -Wformat=0 CFLAGS += -Wmissing-format-attribute -Wno-deprecated-declarations CFLAGS += #-Wpacked CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 6cd3439..600e4e9 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -158,7 +158,7 @@ "=============================================================================\n\r"); #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) - TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", g_unique_id[0], g_unique_id[1], g_unique_id[2], g_unique_id[3]); @@ -173,7 +173,7 @@ if (reset_cause < ARRAY_SIZE(reset_causes)) { TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); } else { - TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); } #endif diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c index f7eb15d..97455fb 100644 --- a/firmware/apps/trace/main.c +++ b/firmware/apps/trace/main.c @@ -165,11 +165,11 @@ "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r" "=============================================================================\n\r"); - TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", g_unique_id[0], g_unique_id[1], g_unique_id[2], g_unique_id[3]); - TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); TRACE_INFO("USB configuration used: %d\n\r", simtrace_config); board_main_top(); diff --git a/firmware/libboard/common/source/boardver_adc.c b/firmware/libboard/common/source/boardver_adc.c index 51db929..11799cc 100644 --- a/firmware/libboard/common/source/boardver_adc.c +++ b/firmware/libboard/common/source/boardver_adc.c @@ -86,7 +86,7 @@ /* convert to voltage */ sample = ADC->ADC_CDR[2]; uv = adc2uv(sample); - TRACE_INFO("VERSION_DET ADC=%u => %u uV\r\n", sample, uv); + TRACE_INFO("VERSION_DET ADC=%u => %lu uV\r\n", sample, uv); /* FIXME: convert to board version based on thresholds */ diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index bdc08f9..f04bc12 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -163,13 +163,13 @@ UART_GetIntegerMinMax(&addr, 0, 255); printf("Please enter EEPROM value:\n\r"); UART_GetIntegerMinMax(&val, 0, 255); - printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr); + printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr); eeprom_write_byte(0x50, addr, val); break; case 'r': printf("Please enter EEPROM offset:\n\r"); UART_GetIntegerMinMax(&addr, 0, 255); - printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr)); + printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr)); break; default: printf("Unknown command '%c'\n\r", ch); diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index af90351..75910c1 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -112,7 +112,7 @@ #define _P3 4 struct card_handle { - uint32_t num; + unsigned int num; enum iso7816_3_card_state state; diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 783c976..ea573bb 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -150,7 +150,7 @@ rc = USBD_Read(ep, msg->head, msgb_tailroom(msg), (TransferCallback) &usb_read_cb, msg); if (rc != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error %s\n", __func__, rc); + TRACE_ERROR("%s error %d\n", __func__, rc); usb_buf_free(msg); bep->in_progress = 0; } diff --git a/firmware/libcommon/source/iso7816_4.c b/firmware/libcommon/source/iso7816_4.c index ac15306..34b84a9 100644 --- a/firmware/libcommon/source/iso7816_4.c +++ b/firmware/libcommon/source/iso7816_4.c @@ -140,8 +140,8 @@ while((us_base->US_CSR & (US_CSR_TXRDY)) == 0) { i++; if (!(i%1000000)) { - printf("s: %x ", us_base->US_CSR); - printf("s: %x\r\n", us_base->US_RHR & 0xFF); + printf("s: %lx ", us_base->US_CSR); + printf("s: %lx\r\n", us_base->US_RHR & 0xFF); us_base->US_CR = US_CR_RSTTX; us_base->US_CR = US_CR_RSTRX; } diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 76b3a01..98818e1 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -50,7 +50,7 @@ #endif struct cardem_inst { - uint32_t num; + unsigned int num; struct card_handle *ch; struct llist_head usb_out_queue; struct ringbuf rb; @@ -117,7 +117,7 @@ /* wait until last char has been fully transmitted */ while ((usart->US_CSR & (US_CSR_TXEMPTY)) == 0) { if (!(i%1000000)) { - TRACE_ERROR("s: %x \r\n", usart->US_CSR); + TRACE_ERROR("s: %lx \r\n", usart->US_CSR); } i++; } @@ -174,7 +174,7 @@ int i = 1; while ((usart->US_CSR & (US_CSR_TXRDY)) == 0) { if (!(i%1000000)) { - TRACE_ERROR("%u: s: %x %02X\r\n", + TRACE_ERROR("%u: s: %lx %02lX\r\n", uart_chan, usart->US_CSR, usart->US_RHR & 0xFF); usart->US_CR = US_CR_RSTTX; @@ -213,7 +213,7 @@ if (csr & (US_CSR_OVRE|US_CSR_FRAME|US_CSR_PARE| US_CSR_TIMEOUT|US_CSR_NACK|(1<<10))) { usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK; - TRACE_ERROR("%u e 0x%x st: 0x%x\n", ci->num, byte, csr); + TRACE_ERROR("%u e 0x%x st: 0x%lx\n", ci->num, byte, csr); } } diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 564c3ef..862fffd 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -62,7 +62,7 @@ for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) { if (ptr == msgb_data[i]) { if (!msgb_inuse[i]) { - TRACE_ERROR("%s: double_free by \r\n", __func__, location); + TRACE_ERROR("%s: double_free by %s\r\n", __func__, location); } else { msgb_inuse[i] = 0; } diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index 6c0d363..889ca2d 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -58,7 +58,7 @@ { int ret; // FIXME: no printfs in ISRs? - printf("+++ Int!! %x\n\r", pinPhoneRST.pio->PIO_ISR); + printf("+++ Int!! %lx\n\r", pinPhoneRST.pio->PIO_ISR); if (((pinPhoneRST.pio->PIO_ISR & pinPhoneRST.mask) != 0)) { if (PIO_Get(&pinPhoneRST) == 0) { printf(" 0 "); diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 3cd0b89..33c16d3 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -215,7 +215,7 @@ wt_d = d; } wt = wt_wi*960UL*wt_d; - TRACE_INFO("WT updated to %u\n\r", wt); + TRACE_INFO("WT updated to %lu\n\r", wt); } /*! Allocate USB buffer and push + initialize simtrace_msg_hdr @@ -325,7 +325,7 @@ uint32_t i; for (i = 0; i < nb_flags; i++) { if (flags & flag_meanings[i].value) { - printf(flag_meanings[i].str); + printf("%s", flag_meanings[i].str); flags &= ~flag_meanings[i].value; if (flags) { printf(", "); diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index 06ad611..04d73f0 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -62,8 +62,10 @@ //------------------------------------------------------------------------------ // FILE* const stdin = NULL; -FILE* const stdout = NULL; -FILE* const stderr = NULL; +/* If we use NULL here, we get compiler warnings of calling stdio functions with + * NULL values. Our fputs() implementation ignores the value of those pointers anyway */ +FILE* const stdout = (FILE *) 0x1; +FILE* const stderr = (FILE *) 0x2; //------------------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/10608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5ec466361bcc526fac1f4897673264ee5af3458b Gerrit-Change-Number: 10608 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 07:57:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 07:57:27 +0000 Subject: Change in simtrace2[master]: owhw: Fix cardem GPIO initialization pointer value Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10609 Change subject: owhw: Fix cardem GPIO initialization pointer value ...................................................................... owhw: Fix cardem GPIO initialization pointer value This fixes a bug, identified by the below compiler warning: libboard/owhw/source/owhw.c: In function 'cardsim_gpio_init': libboard/owhw/source/owhw.c:39:16: warning: passing argument 1 of 'PIO_Configure' from incompatible pointer type [-Wincompatible-pointer-types] PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim)); ^ In file included from ./atmel_softpack_libraries/libchip_sam3s/chip.h:45:0, from libboard/owhw/source/owhw.c:20: ./atmel_softpack_libraries/libchip_sam3s/include/pio.h:189:16: note: expected 'const Pin * {aka const struct _Pin *}' but argument is of type 'const Pin (*)[2] {aka const struct _Pin (*)[2]}' extern uint8_t PIO_Configure( const Pin *list, uint32_t size ) ; ^~~~~~~~~~~~~ Change-Id: I4c1de66c0b8475bb355b1d128f6ec88b2f2a7fcf --- M firmware/libboard/owhw/source/owhw.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/09/10609/1 diff --git a/firmware/libboard/owhw/source/owhw.c b/firmware/libboard/owhw/source/owhw.c index c5cbf7b..2cfa8c6 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -36,5 +36,5 @@ void cardsim_gpio_init(void) { - PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim)); + PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim)); } -- To view, visit https://gerrit.osmocom.org/10609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4c1de66c0b8475bb355b1d128f6ec88b2f2a7fcf Gerrit-Change-Number: 10609 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:09:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:09:59 +0000 Subject: Change in simtrace2[master]: Makefiles: Add "make install" target In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10606 to look at the new patch set (#2). Change subject: Makefiles: Add "make install" target ...................................................................... Makefiles: Add "make install" target Change-Id: Ic6835ce55930c60f909e140878c4abab8628e077 --- M firmware/Makefile M host/Makefile 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/06/10606/2 -- To view, visit https://gerrit.osmocom.org/10606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic6835ce55930c60f909e140878c4abab8628e077 Gerrit-Change-Number: 10606 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:10:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:10:00 +0000 Subject: Change in simtrace2[master]: Add Debian packaging rules Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10610 Change subject: Add Debian packaging rules ...................................................................... Add Debian packaging rules Change-Id: Iece115e4dde87bff5dc36286668f50de0abdcb9e --- A debian/changelog A debian/compat A debian/control A debian/rules A debian/simtrace2-firmware.install A debian/simtrace2-utils.install 6 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/10/10610/1 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..492a38b --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +simtrace2 (0.4.149-1) UNRELEASED; urgency=medium + + * Initial release. (Closes: #XXXXXX) + + -- Harald Welte Sun, 26 Aug 2018 08:46:06 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..775b457 --- /dev/null +++ b/debian/control @@ -0,0 +1,29 @@ +Source: simtrace2 +Maintainer: Harald Welte +Section: devel +Priority: optional +Build-Depends: libosmocore-dev, + libnewlib-arm-none-eabi, + libusb-1.0-0-dev, + gcc-arm-none-eabi +Standards-Version: 3.9.8 +Vcs-Git: git://git.osmocom.org/simtrace2.git +Vcs-Browser: http://git.osmocom.org/simtrace2/ +Homepage: http://osmocom.org/projects/simtrace2/wiki + +Package: simtrace2-firmware +Section: devel +Architecture: all +Recommends: dfu-util +Description: Firmware for SAM3 based SIMtrace2 USB Devices. + Open Source firmware for the Cortex-M3 microcontroller in the + "Osmocom SIMtrace2" USB-attached peripheral device. Will only work in + SAM3S-based SIMtrace2, not in its SAM7S-based predecessor SIMtrace! + +Package: simtrace2-utils +Section: devel +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: simtrace2-firmware +Description: Host utilities to communicate with SIMtrace2 USB Devices. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..2d33f6a --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ diff --git a/debian/simtrace2-firmware.install b/debian/simtrace2-firmware.install new file mode 100644 index 0000000..9be493a --- /dev/null +++ b/debian/simtrace2-firmware.install @@ -0,0 +1 @@ +usr/share/simtrace2/*.bin diff --git a/debian/simtrace2-utils.install b/debian/simtrace2-utils.install new file mode 100644 index 0000000..0eb66e1 --- /dev/null +++ b/debian/simtrace2-utils.install @@ -0,0 +1 @@ +usr/bin/simtrace2-* -- To view, visit https://gerrit.osmocom.org/10610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iece115e4dde87bff5dc36286668f50de0abdcb9e Gerrit-Change-Number: 10610 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:12:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:12:35 +0000 Subject: Change in simtrace2[master]: Add Debian packaging rules In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10610 ) Change subject: Add Debian packaging rules ...................................................................... Add Debian packaging rules Change-Id: Iece115e4dde87bff5dc36286668f50de0abdcb9e --- A debian/changelog A debian/compat A debian/control A debian/rules A debian/simtrace2-firmware.install A debian/simtrace2-utils.install 6 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/10/10610/2 -- To view, visit https://gerrit.osmocom.org/10610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iece115e4dde87bff5dc36286668f50de0abdcb9e Gerrit-Change-Number: 10610 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:15:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:15:34 +0000 Subject: Change in simtrace2[master]: host: Fix "make clean": remove simtrace2-sniff In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10605 ) Change subject: host: Fix "make clean": remove simtrace2-sniff ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib233b6a4b3976286196da95036cadcf2d3382f77 Gerrit-Change-Number: 10605 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 08:15:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:15:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:15:50 +0000 Subject: Change in simtrace2[master]: Makefiles: Add "make install" target In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10606 ) Change subject: Makefiles: Add "make install" target ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic6835ce55930c60f909e140878c4abab8628e077 Gerrit-Change-Number: 10606 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 08:15:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:16:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:16:04 +0000 Subject: Change in simtrace2[master]: add master Makefile to build firmware and host tools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10607 ) Change subject: add master Makefile to build firmware and host tools ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/10607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af Gerrit-Change-Number: 10607 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 08:16:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:17:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:17:10 +0000 Subject: Change in simtrace2[master]: firmware: Enable -Wformat and resolve all related compiler warnings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10608 ) Change subject: firmware: Enable -Wformat and resolve all related compiler warnings ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ec466361bcc526fac1f4897673264ee5af3458b Gerrit-Change-Number: 10608 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 08:17:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:17:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:17:26 +0000 Subject: Change in simtrace2[master]: owhw: Fix cardem GPIO initialization pointer value In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10609 ) Change subject: owhw: Fix cardem GPIO initialization pointer value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4c1de66c0b8475bb355b1d128f6ec88b2f2a7fcf Gerrit-Change-Number: 10609 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 08:17:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:22:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:22:21 +0000 Subject: Change in simtrace2[master]: add master Makefile to build firmware and host tools In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10607 to look at the new patch set (#3). Change subject: add master Makefile to build firmware and host tools ...................................................................... add master Makefile to build firmware and host tools Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af --- A Makefile 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/07/10607/3 -- To view, visit https://gerrit.osmocom.org/10607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af Gerrit-Change-Number: 10607 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:22:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:22:41 +0000 Subject: Change in simtrace2[master]: add master Makefile to build firmware and host tools In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10607 ) Change subject: add master Makefile to build firmware and host tools ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af Gerrit-Change-Number: 10607 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 08:22:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:23:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:23:47 +0000 Subject: Change in simtrace2[master]: host: Fix "make clean": remove simtrace2-sniff In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10605 ) Change subject: host: Fix "make clean": remove simtrace2-sniff ...................................................................... host: Fix "make clean": remove simtrace2-sniff Change-Id: Ib233b6a4b3976286196da95036cadcf2d3382f77 --- M host/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/host/Makefile b/host/Makefile index 50497c4..02f2a8f 100644 --- a/host/Makefile +++ b/host/Makefile @@ -19,4 +19,4 @@ $(CC) $(CFLAGS) `pkg-config --cflags libusb-1.0 libosmocore` -o $@ -c $^ clean: - @rm -f simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list *.o + @rm -f simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff *.o -- To view, visit https://gerrit.osmocom.org/10605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib233b6a4b3976286196da95036cadcf2d3382f77 Gerrit-Change-Number: 10605 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:23:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:23:48 +0000 Subject: Change in simtrace2[master]: Makefiles: Add "make install" target In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10606 ) Change subject: Makefiles: Add "make install" target ...................................................................... Makefiles: Add "make install" target Change-Id: Ic6835ce55930c60f909e140878c4abab8628e077 --- M firmware/Makefile M host/Makefile 2 files changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index ca22bdd..c9039a3 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -234,3 +234,7 @@ clean: -rm -fR $(OBJ)/*.o $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(BIN)/*.lst `find . -name \*.p` + +install: + mkdir -p $(DESTDIR)/usr/share/simtrace2 + cp $(BIN)/*.bin $(BIN)/*.elf $(BIN)/*.elf.txt $(BIN)/*.map $(DESTDIR)/usr/share/simtrace2 diff --git a/host/Makefile b/host/Makefile index 02f2a8f..7d5c7a4 100644 --- a/host/Makefile +++ b/host/Makefile @@ -1,7 +1,9 @@ LDFLAGS=`pkg-config --libs libusb-1.0 libosmocore` -losmocore CFLAGS=-Wall -g -all: simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff +APPS=simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff + +all: $(APPS) simtrace2-remsim: simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o $(CC) -o $@ $^ $(LDFLAGS) -losmosim @@ -19,4 +21,8 @@ $(CC) $(CFLAGS) `pkg-config --cflags libusb-1.0 libosmocore` -o $@ -c $^ clean: - @rm -f simtrace2-remsim simtrace2-remsim-usb2udp simtrace2-list simtrace2-sniff *.o + @rm -f *.o $(APPS) + +install: $(APPS) + mkdir -p $(DESTDIR)/usr/bin + cp $(APPS) $(DESTDIR)/usr/bin/ -- To view, visit https://gerrit.osmocom.org/10606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic6835ce55930c60f909e140878c4abab8628e077 Gerrit-Change-Number: 10606 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:25:38 +0000 Subject: Change in simtrace2[master]: add master Makefile to build firmware and host tools In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10607 ) Change subject: add master Makefile to build firmware and host tools ...................................................................... add master Makefile to build firmware and host tools Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af --- A Makefile 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1c00740 --- /dev/null +++ b/Makefile @@ -0,0 +1,27 @@ +all: fw utils + +define RULES +fw-$(1)-$(2): + make -C firmware BOARD=$(1) APP=$(2) +fw-$(1)-$(2)-clean: + make -C firmware BOARD=$(1) APP=$(2) clean +endef + +$(eval $(call RULES,simtrace,dfu)) +$(eval $(call RULES,simtrace,trace)) +$(eval $(call RULES,simtrace,cardem)) +$(eval $(call RULES,qmod,dfu)) +$(eval $(call RULES,qmod,cardem)) + +fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw-qmod-dfu-clean fw-qmod-cardem-clean +fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem + +utils: + make -C host + +clean: fw-clean + make -C host clean + +install: + make -C firmware install + make -C host install -- To view, visit https://gerrit.osmocom.org/10607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I715d3fdaff9d80673bb2208ea9d56637f4e459af Gerrit-Change-Number: 10607 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:25:38 +0000 Subject: Change in simtrace2[master]: firmware: Enable -Wformat and resolve all related compiler warnings In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10608 ) Change subject: firmware: Enable -Wformat and resolve all related compiler warnings ...................................................................... firmware: Enable -Wformat and resolve all related compiler warnings There have been tons of format-string related bugs in our code which we never discovered due to disabling -Wformat. Let's fix that. Change-Id: I5ec466361bcc526fac1f4897673264ee5af3458b --- M firmware/Makefile M firmware/apps/cardem/main.c M firmware/apps/trace/main.c M firmware/libboard/common/source/boardver_adc.c M firmware/libboard/qmod/source/board_qmod.c M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/host_communication.c M firmware/libcommon/source/iso7816_4.c M firmware/libcommon/source/mode_cardemu.c M firmware/libcommon/source/pseudo_talloc.c M firmware/libcommon/source/simtrace_iso7816.c M firmware/libcommon/source/sniffer.c M firmware/libcommon/source/stdio.c 13 files changed, 24 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index c9039a3..c0f53f3 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -141,13 +141,12 @@ INCLUDES += -Isrc_simtrace -Iinclude INCLUDES += -Iapps/$(APP) -CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2 +CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal #-Wundef CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings CFLAGS += -Waggregate-return #-Wsign-compare -CFLAGS += -Wformat=0 CFLAGS += -Wmissing-format-attribute -Wno-deprecated-declarations CFLAGS += #-Wpacked CFLAGS += -Wredundant-decls -Wnested-externs #-Winline -Wlong-long diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 6cd3439..600e4e9 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -158,7 +158,7 @@ "=============================================================================\n\r"); #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) - TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", g_unique_id[0], g_unique_id[1], g_unique_id[2], g_unique_id[3]); @@ -173,7 +173,7 @@ if (reset_cause < ARRAY_SIZE(reset_causes)) { TRACE_INFO("Reset Cause: %s\n\r", reset_causes[reset_cause]); } else { - TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); } #endif diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c index f7eb15d..97455fb 100644 --- a/firmware/apps/trace/main.c +++ b/firmware/apps/trace/main.c @@ -165,11 +165,11 @@ "SIMtrace2 firmware " GIT_VERSION " (C) 2010-2016 by Harald Welte\n\r" "=============================================================================\n\r"); - TRACE_INFO("Chip ID: 0x%08x (Ext 0x%08x)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); + TRACE_INFO("Chip ID: 0x%08lx (Ext 0x%08lx)\n\r", CHIPID->CHIPID_CIDR, CHIPID->CHIPID_EXID); TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", g_unique_id[0], g_unique_id[1], g_unique_id[2], g_unique_id[3]); - TRACE_INFO("Reset Cause: 0x%x\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); + TRACE_INFO("Reset Cause: 0x%lx\n\r", (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos); TRACE_INFO("USB configuration used: %d\n\r", simtrace_config); board_main_top(); diff --git a/firmware/libboard/common/source/boardver_adc.c b/firmware/libboard/common/source/boardver_adc.c index 51db929..11799cc 100644 --- a/firmware/libboard/common/source/boardver_adc.c +++ b/firmware/libboard/common/source/boardver_adc.c @@ -86,7 +86,7 @@ /* convert to voltage */ sample = ADC->ADC_CDR[2]; uv = adc2uv(sample); - TRACE_INFO("VERSION_DET ADC=%u => %u uV\r\n", sample, uv); + TRACE_INFO("VERSION_DET ADC=%u => %lu uV\r\n", sample, uv); /* FIXME: convert to board version based on thresholds */ diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index bdc08f9..f04bc12 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -163,13 +163,13 @@ UART_GetIntegerMinMax(&addr, 0, 255); printf("Please enter EEPROM value:\n\r"); UART_GetIntegerMinMax(&val, 0, 255); - printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr); + printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr); eeprom_write_byte(0x50, addr, val); break; case 'r': printf("Please enter EEPROM offset:\n\r"); UART_GetIntegerMinMax(&addr, 0, 255); - printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr)); + printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr)); break; default: printf("Unknown command '%c'\n\r", ch); diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index af90351..75910c1 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -112,7 +112,7 @@ #define _P3 4 struct card_handle { - uint32_t num; + unsigned int num; enum iso7816_3_card_state state; diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c index 783c976..ea573bb 100644 --- a/firmware/libcommon/source/host_communication.c +++ b/firmware/libcommon/source/host_communication.c @@ -150,7 +150,7 @@ rc = USBD_Read(ep, msg->head, msgb_tailroom(msg), (TransferCallback) &usb_read_cb, msg); if (rc != USBD_STATUS_SUCCESS) { - TRACE_ERROR("%s error %s\n", __func__, rc); + TRACE_ERROR("%s error %d\n", __func__, rc); usb_buf_free(msg); bep->in_progress = 0; } diff --git a/firmware/libcommon/source/iso7816_4.c b/firmware/libcommon/source/iso7816_4.c index ac15306..34b84a9 100644 --- a/firmware/libcommon/source/iso7816_4.c +++ b/firmware/libcommon/source/iso7816_4.c @@ -140,8 +140,8 @@ while((us_base->US_CSR & (US_CSR_TXRDY)) == 0) { i++; if (!(i%1000000)) { - printf("s: %x ", us_base->US_CSR); - printf("s: %x\r\n", us_base->US_RHR & 0xFF); + printf("s: %lx ", us_base->US_CSR); + printf("s: %lx\r\n", us_base->US_RHR & 0xFF); us_base->US_CR = US_CR_RSTTX; us_base->US_CR = US_CR_RSTRX; } diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 76b3a01..98818e1 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -50,7 +50,7 @@ #endif struct cardem_inst { - uint32_t num; + unsigned int num; struct card_handle *ch; struct llist_head usb_out_queue; struct ringbuf rb; @@ -117,7 +117,7 @@ /* wait until last char has been fully transmitted */ while ((usart->US_CSR & (US_CSR_TXEMPTY)) == 0) { if (!(i%1000000)) { - TRACE_ERROR("s: %x \r\n", usart->US_CSR); + TRACE_ERROR("s: %lx \r\n", usart->US_CSR); } i++; } @@ -174,7 +174,7 @@ int i = 1; while ((usart->US_CSR & (US_CSR_TXRDY)) == 0) { if (!(i%1000000)) { - TRACE_ERROR("%u: s: %x %02X\r\n", + TRACE_ERROR("%u: s: %lx %02lX\r\n", uart_chan, usart->US_CSR, usart->US_RHR & 0xFF); usart->US_CR = US_CR_RSTTX; @@ -213,7 +213,7 @@ if (csr & (US_CSR_OVRE|US_CSR_FRAME|US_CSR_PARE| US_CSR_TIMEOUT|US_CSR_NACK|(1<<10))) { usart->US_CR = US_CR_RSTSTA | US_CR_RSTIT | US_CR_RSTNACK; - TRACE_ERROR("%u e 0x%x st: 0x%x\n", ci->num, byte, csr); + TRACE_ERROR("%u e 0x%x st: 0x%lx\n", ci->num, byte, csr); } } diff --git a/firmware/libcommon/source/pseudo_talloc.c b/firmware/libcommon/source/pseudo_talloc.c index 564c3ef..862fffd 100644 --- a/firmware/libcommon/source/pseudo_talloc.c +++ b/firmware/libcommon/source/pseudo_talloc.c @@ -62,7 +62,7 @@ for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) { if (ptr == msgb_data[i]) { if (!msgb_inuse[i]) { - TRACE_ERROR("%s: double_free by \r\n", __func__, location); + TRACE_ERROR("%s: double_free by %s\r\n", __func__, location); } else { msgb_inuse[i] = 0; } diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c index 6c0d363..889ca2d 100644 --- a/firmware/libcommon/source/simtrace_iso7816.c +++ b/firmware/libcommon/source/simtrace_iso7816.c @@ -58,7 +58,7 @@ { int ret; // FIXME: no printfs in ISRs? - printf("+++ Int!! %x\n\r", pinPhoneRST.pio->PIO_ISR); + printf("+++ Int!! %lx\n\r", pinPhoneRST.pio->PIO_ISR); if (((pinPhoneRST.pio->PIO_ISR & pinPhoneRST.mask) != 0)) { if (PIO_Get(&pinPhoneRST) == 0) { printf(" 0 "); diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 3cd0b89..33c16d3 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -215,7 +215,7 @@ wt_d = d; } wt = wt_wi*960UL*wt_d; - TRACE_INFO("WT updated to %u\n\r", wt); + TRACE_INFO("WT updated to %lu\n\r", wt); } /*! Allocate USB buffer and push + initialize simtrace_msg_hdr @@ -325,7 +325,7 @@ uint32_t i; for (i = 0; i < nb_flags; i++) { if (flags & flag_meanings[i].value) { - printf(flag_meanings[i].str); + printf("%s", flag_meanings[i].str); flags &= ~flag_meanings[i].value; if (flags) { printf(", "); diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index 06ad611..04d73f0 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -62,8 +62,10 @@ //------------------------------------------------------------------------------ // FILE* const stdin = NULL; -FILE* const stdout = NULL; -FILE* const stderr = NULL; +/* If we use NULL here, we get compiler warnings of calling stdio functions with + * NULL values. Our fputs() implementation ignores the value of those pointers anyway */ +FILE* const stdout = (FILE *) 0x1; +FILE* const stderr = (FILE *) 0x2; //------------------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/10608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5ec466361bcc526fac1f4897673264ee5af3458b Gerrit-Change-Number: 10608 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:25:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:25:39 +0000 Subject: Change in simtrace2[master]: owhw: Fix cardem GPIO initialization pointer value In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10609 ) Change subject: owhw: Fix cardem GPIO initialization pointer value ...................................................................... owhw: Fix cardem GPIO initialization pointer value This fixes a bug, identified by the below compiler warning: libboard/owhw/source/owhw.c: In function 'cardsim_gpio_init': libboard/owhw/source/owhw.c:39:16: warning: passing argument 1 of 'PIO_Configure' from incompatible pointer type [-Wincompatible-pointer-types] PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim)); ^ In file included from ./atmel_softpack_libraries/libchip_sam3s/chip.h:45:0, from libboard/owhw/source/owhw.c:20: ./atmel_softpack_libraries/libchip_sam3s/include/pio.h:189:16: note: expected 'const Pin * {aka const struct _Pin *}' but argument is of type 'const Pin (*)[2] {aka const struct _Pin (*)[2]}' extern uint8_t PIO_Configure( const Pin *list, uint32_t size ) ; ^~~~~~~~~~~~~ Change-Id: I4c1de66c0b8475bb355b1d128f6ec88b2f2a7fcf --- M firmware/libboard/owhw/source/owhw.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libboard/owhw/source/owhw.c b/firmware/libboard/owhw/source/owhw.c index c5cbf7b..2cfa8c6 100644 --- a/firmware/libboard/owhw/source/owhw.c +++ b/firmware/libboard/owhw/source/owhw.c @@ -36,5 +36,5 @@ void cardsim_gpio_init(void) { - PIO_Configure(&pins_cardsim, ARRAY_SIZE(pins_cardsim)); + PIO_Configure(pins_cardsim, ARRAY_SIZE(pins_cardsim)); } -- To view, visit https://gerrit.osmocom.org/10609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4c1de66c0b8475bb355b1d128f6ec88b2f2a7fcf Gerrit-Change-Number: 10609 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:31:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:31:14 +0000 Subject: Change in simtrace2[master]: Add Debian packaging rules In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10610 ) Change subject: Add Debian packaging rules ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iece115e4dde87bff5dc36286668f50de0abdcb9e Gerrit-Change-Number: 10610 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 08:31:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:31:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:31:16 +0000 Subject: Change in simtrace2[master]: Add Debian packaging rules In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10610 ) Change subject: Add Debian packaging rules ...................................................................... Add Debian packaging rules Change-Id: Iece115e4dde87bff5dc36286668f50de0abdcb9e --- A debian/changelog A debian/compat A debian/control A debian/rules A debian/simtrace2-firmware.install A debian/simtrace2-utils.install 6 files changed, 42 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..492a38b --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +simtrace2 (0.4.149-1) UNRELEASED; urgency=medium + + * Initial release. (Closes: #XXXXXX) + + -- Harald Welte Sun, 26 Aug 2018 08:46:06 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..490ed85 --- /dev/null +++ b/debian/control @@ -0,0 +1,30 @@ +Source: simtrace2 +Maintainer: Harald Welte +Section: devel +Priority: optional +Build-Depends: debhelper (>= 9), + libosmocore-dev, + libnewlib-arm-none-eabi, + libusb-1.0-0-dev, + gcc-arm-none-eabi +Standards-Version: 3.9.8 +Vcs-Git: git://git.osmocom.org/simtrace2.git +Vcs-Browser: http://git.osmocom.org/simtrace2/ +Homepage: http://osmocom.org/projects/simtrace2/wiki + +Package: simtrace2-firmware +Section: devel +Architecture: all +Recommends: dfu-util +Description: Firmware for SAM3 based SIMtrace2 USB Devices. + Open Source firmware for the Cortex-M3 microcontroller in the + "Osmocom SIMtrace2" USB-attached peripheral device. Will only work in + SAM3S-based SIMtrace2, not in its SAM7S-based predecessor SIMtrace! + +Package: simtrace2-utils +Section: devel +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: simtrace2-firmware +Description: Host utilities to communicate with SIMtrace2 USB Devices. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..2d33f6a --- /dev/null +++ b/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ diff --git a/debian/simtrace2-firmware.install b/debian/simtrace2-firmware.install new file mode 100644 index 0000000..9be493a --- /dev/null +++ b/debian/simtrace2-firmware.install @@ -0,0 +1 @@ +usr/share/simtrace2/*.bin diff --git a/debian/simtrace2-utils.install b/debian/simtrace2-utils.install new file mode 100644 index 0000000..0eb66e1 --- /dev/null +++ b/debian/simtrace2-utils.install @@ -0,0 +1 @@ +usr/bin/simtrace2-* -- To view, visit https://gerrit.osmocom.org/10610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iece115e4dde87bff5dc36286668f50de0abdcb9e Gerrit-Change-Number: 10610 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:36:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:36:11 +0000 Subject: Change in osmo-ci[master]: nightly packages: add simtrace2 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10611 Change subject: nightly packages: add simtrace2 ...................................................................... nightly packages: add simtrace2 Change-Id: Idab162dd11c631d5e72f09b08ed04610e16f05a9 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/11/10611/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 88b6812..ba324cb 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -182,6 +182,7 @@ checkout python/osmo-python-tests checkout rtl-sdr checkout osmo-fl2k + checkout simtrace2 create_osmo_trx_debian8_jessie @@ -211,6 +212,7 @@ build osmo-python-tests build rtl-sdr build osmo-fl2k + build simtrace2 download_bumpversion -- To view, visit https://gerrit.osmocom.org/10611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idab162dd11c631d5e72f09b08ed04610e16f05a9 Gerrit-Change-Number: 10611 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:37:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:37:55 +0000 Subject: Change in simtrace2[master]: v0.5 debian package release Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10612 Change subject: v0.5 debian package release ...................................................................... v0.5 debian package release Change-Id: Iaf56c03f966a5dfc8b750d926f0429223aeec54e --- M debian/changelog 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/12/10612/1 diff --git a/debian/changelog b/debian/changelog index 492a38b..c9cf4e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -simtrace2 (0.4.149-1) UNRELEASED; urgency=medium +simtrace2 (0.5) UNRELEASED; urgency=medium - * Initial release. (Closes: #XXXXXX) + * Initial debian package release. - -- Harald Welte Sun, 26 Aug 2018 08:46:06 +0200 + -- Harald Welte Sun, 26 Aug 2018 10:37:19 +0200 -- To view, visit https://gerrit.osmocom.org/10612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf56c03f966a5dfc8b750d926f0429223aeec54e Gerrit-Change-Number: 10612 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:48:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:48:04 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Add simtrace2 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10613 Change subject: osmocom-latest-packages: Add simtrace2 ...................................................................... osmocom-latest-packages: Add simtrace2 Change-Id: I9e6b01f465470f77c58268979d3608afe2005b1c --- M scripts/osmocom-latest-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/13/10613/1 diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 83ab084..ac5a2dd 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -88,6 +88,7 @@ osmo-mgw osmo-msc osmo-bsc + simtrace2 " # add those two once they have tagged any versions that include the 'debian' sub-dir #rtl-sdr -- To view, visit https://gerrit.osmocom.org/10613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9e6b01f465470f77c58268979d3608afe2005b1c Gerrit-Change-Number: 10613 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 08:53:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 08:53:32 +0000 Subject: Change in simtrace2[master]: debian/control: Depend on libosmocore >= 0.12.1 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10614 Change subject: debian/control: Depend on libosmocore >= 0.12.1 ...................................................................... debian/control: Depend on libosmocore >= 0.12.1 Only this version includes the GSMTAP_SIM_ATR and GSMTAP_SIM_APDU definitions. Change-Id: I988cad56aed755af416fc7f23822dcf0229dbb7d --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/14/10614/1 diff --git a/debian/control b/debian/control index 490ed85..06f3e29 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Build-Depends: debhelper (>= 9), - libosmocore-dev, + libosmocore-dev (>= 0.12.1), libnewlib-arm-none-eabi, libusb-1.0-0-dev, gcc-arm-none-eabi -- To view, visit https://gerrit.osmocom.org/10614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I988cad56aed755af416fc7f23822dcf0229dbb7d Gerrit-Change-Number: 10614 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:26:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:26:23 +0000 Subject: Change in simtrace2[master]: v0.5 debian package release In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10612 ) Change subject: v0.5 debian package release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf56c03f966a5dfc8b750d926f0429223aeec54e Gerrit-Change-Number: 10612 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 09:26:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:26:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:26:25 +0000 Subject: Change in simtrace2[master]: debian/control: Depend on libosmocore >= 0.12.1 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10614 ) Change subject: debian/control: Depend on libosmocore >= 0.12.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I988cad56aed755af416fc7f23822dcf0229dbb7d Gerrit-Change-Number: 10614 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 09:26:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:26:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:26:27 +0000 Subject: Change in simtrace2[master]: v0.5 debian package release In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10612 ) Change subject: v0.5 debian package release ...................................................................... v0.5 debian package release Change-Id: Iaf56c03f966a5dfc8b750d926f0429223aeec54e --- M debian/changelog 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 492a38b..c9cf4e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -simtrace2 (0.4.149-1) UNRELEASED; urgency=medium +simtrace2 (0.5) UNRELEASED; urgency=medium - * Initial release. (Closes: #XXXXXX) + * Initial debian package release. - -- Harald Welte Sun, 26 Aug 2018 08:46:06 +0200 + -- Harald Welte Sun, 26 Aug 2018 10:37:19 +0200 -- To view, visit https://gerrit.osmocom.org/10612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaf56c03f966a5dfc8b750d926f0429223aeec54e Gerrit-Change-Number: 10612 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:26:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:26:28 +0000 Subject: Change in simtrace2[master]: debian/control: Depend on libosmocore >= 0.12.1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10614 ) Change subject: debian/control: Depend on libosmocore >= 0.12.1 ...................................................................... debian/control: Depend on libosmocore >= 0.12.1 Only this version includes the GSMTAP_SIM_ATR and GSMTAP_SIM_APDU definitions. Change-Id: I988cad56aed755af416fc7f23822dcf0229dbb7d --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 490ed85..06f3e29 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Build-Depends: debhelper (>= 9), - libosmocore-dev, + libosmocore-dev (>= 0.12.1), libnewlib-arm-none-eabi, libusb-1.0-0-dev, gcc-arm-none-eabi -- To view, visit https://gerrit.osmocom.org/10614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I988cad56aed755af416fc7f23822dcf0229dbb7d Gerrit-Change-Number: 10614 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:37:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:37:18 +0000 Subject: Change in osmo-ci[master]: nightly packages: add simtrace2 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10611 ) Change subject: nightly packages: add simtrace2 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 manually verified in home:laforge:osmocom-nightly -- To view, visit https://gerrit.osmocom.org/10611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idab162dd11c631d5e72f09b08ed04610e16f05a9 Gerrit-Change-Number: 10611 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 26 Aug 2018 09:37:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:37:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:37:19 +0000 Subject: Change in osmo-ci[master]: nightly packages: add simtrace2 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10611 ) Change subject: nightly packages: add simtrace2 ...................................................................... nightly packages: add simtrace2 Change-Id: Idab162dd11c631d5e72f09b08ed04610e16f05a9 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 88b6812..ba324cb 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -182,6 +182,7 @@ checkout python/osmo-python-tests checkout rtl-sdr checkout osmo-fl2k + checkout simtrace2 create_osmo_trx_debian8_jessie @@ -211,6 +212,7 @@ build osmo-python-tests build rtl-sdr build osmo-fl2k + build simtrace2 download_bumpversion -- To view, visit https://gerrit.osmocom.org/10611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idab162dd11c631d5e72f09b08ed04610e16f05a9 Gerrit-Change-Number: 10611 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:43:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:43:14 +0000 Subject: Change in simtrace2[master]: Revert "debian/control: Depend on libosmocore >= 0.12.1" Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10615 Change subject: Revert "debian/control: Depend on libosmocore >= 0.12.1" ...................................................................... Revert "debian/control: Depend on libosmocore >= 0.12.1" This reverts commit 77ff745ccad6b0dd58e4476c1b82de70f034f7af. libosmocore 0.12.1 is not recent enough, I misread the 'gitk' output. Change-Id: I87a8e5bbb4aea0c991abe5372f840d76f17378eb --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/15/10615/1 diff --git a/debian/control b/debian/control index 06f3e29..490ed85 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Build-Depends: debhelper (>= 9), - libosmocore-dev (>= 0.12.1), + libosmocore-dev, libnewlib-arm-none-eabi, libusb-1.0-0-dev, gcc-arm-none-eabi -- To view, visit https://gerrit.osmocom.org/10615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I87a8e5bbb4aea0c991abe5372f840d76f17378eb Gerrit-Change-Number: 10615 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:43:15 +0000 Subject: Change in simtrace2[master]: simtrace2-sniff: Fix build with released libosmocore versions Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10616 Change subject: simtrace2-sniff: Fix build with released libosmocore versions ...................................................................... simtrace2-sniff: Fix build with released libosmocore versions There's still no released libosmocore defining the GSMTAP_TYPE_SIM sub-types (Change-Id: I5bd0dff5a4a90cfe96d9c4f3dec6657e1d85bf7a dated Jul 26, 2018). Let's make sure users don't need an unreleased version of the library if it's only about a few #defines that we can just copy here for backwards compatibility. Change-Id: I2fd9e14873711d60f194bb404420bbfbb0a00f48 --- M host/simtrace2-sniff.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/16/10616/1 diff --git a/host/simtrace2-sniff.c b/host/simtrace2-sniff.c index 368ae60..dddf5cf 100644 --- a/host/simtrace2-sniff.c +++ b/host/simtrace2-sniff.c @@ -51,6 +51,19 @@ #include #include +/* as of August 26, 2018 we don't have any released libosmocore version which includes those + * definitions yet. Let's ensure some backwards compatibility: */ +#ifndef GSMTAP_SIM_APDU +#define GSMTAP_SIM_APDU 0x00 /* APDU data (complete APDU) */ +#define GSMTAP_SIM_ATR 0x01 /* card ATR data */ +#define GSMTAP_SIM_PPS_REQ 0x02 /* PPS request data */ +#define GSMTAP_SIM_PPS_RSP 0x03 /* PPS response data */ +#define GSMTAP_SIM_TPDU_HDR 0x04 /* TPDU command header */ +#define GSMTAP_SIM_TPDU_CMD 0x05 /* TPDU command body */ +#define GSMTAP_SIM_TPDU_RSP 0x06 /* TPDU response body */ +#define GSMTAP_SIM_TPDU_SW 0x07 /* TPDU response trailer */ +#endif + /* transport to a SIMtrace device */ struct st_transport { /* USB */ -- To view, visit https://gerrit.osmocom.org/10616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2fd9e14873711d60f194bb404420bbfbb0a00f48 Gerrit-Change-Number: 10616 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:43:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:43:57 +0000 Subject: Change in simtrace2[master]: Revert "debian/control: Depend on libosmocore >= 0.12.1" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10615 ) Change subject: Revert "debian/control: Depend on libosmocore >= 0.12.1" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I87a8e5bbb4aea0c991abe5372f840d76f17378eb Gerrit-Change-Number: 10615 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 26 Aug 2018 09:43:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:44:17 +0000 Subject: Change in simtrace2[master]: simtrace2-sniff: Fix build with released libosmocore versions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10616 ) Change subject: simtrace2-sniff: Fix build with released libosmocore versions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2fd9e14873711d60f194bb404420bbfbb0a00f48 Gerrit-Change-Number: 10616 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 09:44:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:47:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:47:32 +0000 Subject: Change in simtrace2[master]: Revert "debian/control: Depend on libosmocore >= 0.12.1" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10615 ) Change subject: Revert "debian/control: Depend on libosmocore >= 0.12.1" ...................................................................... Revert "debian/control: Depend on libosmocore >= 0.12.1" This reverts commit 77ff745ccad6b0dd58e4476c1b82de70f034f7af. libosmocore 0.12.1 is not recent enough, I misread the 'gitk' output. Change-Id: I87a8e5bbb4aea0c991abe5372f840d76f17378eb --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 06f3e29..490ed85 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Build-Depends: debhelper (>= 9), - libosmocore-dev (>= 0.12.1), + libosmocore-dev, libnewlib-arm-none-eabi, libusb-1.0-0-dev, gcc-arm-none-eabi -- To view, visit https://gerrit.osmocom.org/10615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I87a8e5bbb4aea0c991abe5372f840d76f17378eb Gerrit-Change-Number: 10615 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:47:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:47:32 +0000 Subject: Change in simtrace2[master]: simtrace2-sniff: Fix build with released libosmocore versions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10616 ) Change subject: simtrace2-sniff: Fix build with released libosmocore versions ...................................................................... simtrace2-sniff: Fix build with released libosmocore versions There's still no released libosmocore defining the GSMTAP_TYPE_SIM sub-types (Change-Id: I5bd0dff5a4a90cfe96d9c4f3dec6657e1d85bf7a dated Jul 26, 2018). Let's make sure users don't need an unreleased version of the library if it's only about a few #defines that we can just copy here for backwards compatibility. Change-Id: I2fd9e14873711d60f194bb404420bbfbb0a00f48 --- M host/simtrace2-sniff.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/simtrace2-sniff.c b/host/simtrace2-sniff.c index 368ae60..dddf5cf 100644 --- a/host/simtrace2-sniff.c +++ b/host/simtrace2-sniff.c @@ -51,6 +51,19 @@ #include #include +/* as of August 26, 2018 we don't have any released libosmocore version which includes those + * definitions yet. Let's ensure some backwards compatibility: */ +#ifndef GSMTAP_SIM_APDU +#define GSMTAP_SIM_APDU 0x00 /* APDU data (complete APDU) */ +#define GSMTAP_SIM_ATR 0x01 /* card ATR data */ +#define GSMTAP_SIM_PPS_REQ 0x02 /* PPS request data */ +#define GSMTAP_SIM_PPS_RSP 0x03 /* PPS response data */ +#define GSMTAP_SIM_TPDU_HDR 0x04 /* TPDU command header */ +#define GSMTAP_SIM_TPDU_CMD 0x05 /* TPDU command body */ +#define GSMTAP_SIM_TPDU_RSP 0x06 /* TPDU response body */ +#define GSMTAP_SIM_TPDU_SW 0x07 /* TPDU response trailer */ +#endif + /* transport to a SIMtrace device */ struct st_transport { /* USB */ -- To view, visit https://gerrit.osmocom.org/10616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2fd9e14873711d60f194bb404420bbfbb0a00f48 Gerrit-Change-Number: 10616 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:56:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:56:17 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Add simtrace2 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10613 ) Change subject: osmocom-latest-packages: Add simtrace2 ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e6b01f465470f77c58268979d3608afe2005b1c Gerrit-Change-Number: 10613 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 26 Aug 2018 09:56:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:56:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:56:48 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Add simtrace2 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10613 ) Change subject: osmocom-latest-packages: Add simtrace2 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 simtrace2.git has been modified to add the missing definitions from older (released) libosmocore versions, so this works now. Tested in home:laforge:osmocom-latest -- To view, visit https://gerrit.osmocom.org/10613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e6b01f465470f77c58268979d3608afe2005b1c Gerrit-Change-Number: 10613 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 26 Aug 2018 09:56:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 09:56:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 09:56:49 +0000 Subject: Change in osmo-ci[master]: osmocom-latest-packages: Add simtrace2 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10613 ) Change subject: osmocom-latest-packages: Add simtrace2 ...................................................................... osmocom-latest-packages: Add simtrace2 Change-Id: I9e6b01f465470f77c58268979d3608afe2005b1c --- M scripts/osmocom-latest-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 83ab084..ac5a2dd 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -88,6 +88,7 @@ osmo-mgw osmo-msc osmo-bsc + simtrace2 " # add those two once they have tagged any versions that include the 'debian' sub-dir #rtl-sdr -- To view, visit https://gerrit.osmocom.org/10613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9e6b01f465470f77c58268979d3608afe2005b1c Gerrit-Change-Number: 10613 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Aug 26 10:03:40 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Aug 2018 10:03:40 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b827b14c8627_798110ae67c85677b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_8.0/x86_64 Package network:osmocom:latest/simtrace2 failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 53s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 53s] make -C firmware BOARD=simtrace APP=dfu [ 53s] make[2]: Entering directory '/usr/src/packages/BUILD/firmware' [ 53s] gcc usbstring/usbstring.c -o usbstring/usbstring [ 53s] cat apps/dfu/usb_strings.txt | usbstring/usbstring > apps/dfu/usb_strings_generated.h [ 53s] mkdir -p bin [ 53s] mkdir -p obj/simtrace [ 53s] [COMPILING libosmocore/source/panic.c] [ 53s] arm-none-eabi-gcc: error: unrecognized command line option '-fstack-protector-strong' [ 53s] Makefile:224: recipe for target 'obj/simtrace/flash_panic.o' failed [ 53s] make[2]: *** [obj/simtrace/flash_panic.o] Error 1 [ 53s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 53s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 53s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 53s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 53s] dh_auto_build: make -j1 returned exit code 2 [ 53s] debian/rules:4: recipe for target 'build' failed [ 53s] make: *** [build] Error 2 [ 53s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 53s] [ 53s] sheep84 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 10:03:31 UTC 2018. [ 53s] [ 53s] ### VM INTERACTION START ### [ 54s] Powering off. [ 54s] [ 46.884157] reboot: Power down [ 54s] ### VM INTERACTION END ### [ 54s] [ 54s] sheep84 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 10:03:32 UTC 2018. [ 54s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 26 10:03:57 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Aug 2018 10:03:57 +0000 Subject: Build failure of network:osmocom:latest/simtrace2 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b827b159ef4d_798110ae67c85698f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/simtrace2/Debian_8.0/i586 Package network:osmocom:latest/simtrace2 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest simtrace2 Last lines of build log: [ 66s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 66s] make -C firmware BOARD=simtrace APP=dfu [ 66s] make[2]: Entering directory '/usr/src/packages/BUILD/firmware' [ 66s] gcc usbstring/usbstring.c -o usbstring/usbstring [ 66s] cat apps/dfu/usb_strings.txt | usbstring/usbstring > apps/dfu/usb_strings_generated.h [ 66s] mkdir -p bin [ 66s] mkdir -p obj/simtrace [ 66s] [COMPILING libosmocore/source/panic.c] [ 66s] arm-none-eabi-gcc: error: unrecognized command line option '-fstack-protector-strong' [ 66s] Makefile:224: recipe for target 'obj/simtrace/flash_panic.o' failed [ 66s] make[2]: *** [obj/simtrace/flash_panic.o] Error 1 [ 66s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 66s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 66s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 66s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 66s] dh_auto_build: make -j1 returned exit code 2 [ 66s] debian/rules:4: recipe for target 'build' failed [ 66s] make: *** [build] Error 2 [ 66s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 66s] [ 66s] lamb57 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 10:03:39 UTC 2018. [ 66s] [ 66s] ### VM INTERACTION START ### [ 67s] Powering off. [ 67s] [ 56.550994] reboot: Power down [ 67s] ### VM INTERACTION END ### [ 67s] [ 67s] lamb57 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 10:03:41 UTC 2018. [ 67s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Aug 26 10:13:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 10:13:33 +0000 Subject: Change in osmo-mgw[master]: add X-Osmo-IGN MGCP header to ignore CallID In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10585 ) Change subject: add X-Osmo-IGN MGCP header to ignore CallID ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 Gerrit-Change-Number: 10585 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 26 Aug 2018 10:13:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 10:13:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 10:13:35 +0000 Subject: Change in osmo-mgw[master]: add X-Osmo-IGN MGCP header to ignore CallID In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10585 ) Change subject: add X-Osmo-IGN MGCP header to ignore CallID ...................................................................... add X-Osmo-IGN MGCP header to ignore CallID The format is CRCX ... C: ... M: ... X-Osmo-IGN: C So far the only ignorable element is C, i.e. the CallID. Any other items may be added in the future. (I initially intended to also add '@' to ignore the endpoint name's domain part, but in the osmo-mgw code base the domain part is verified long before any additional headers are even parsed, so sparing that refactoring for now.) The intention is that osmo-bsc will issue "X-Osmo-IGN: C" for all SCCPlite calls, because we are unable to retrieve the CallID that the MSC sends to osmo-mgw for the network side of the endpoint. Testing with a specific SCCPlite MSC, I actually observe that all CallIDs are 1, even for concurrent calls. So, an alternative hacky solution would have been to always pass CallID == 1 for SCCPlite connections from osmo-bsc. Related: I257ad574d8060fef19afce9798bd8a5a7f8c99fe (osmo-bsc) Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 --- M include/osmocom/mgcp/mgcp_common.h M include/osmocom/mgcp/mgcp_endp.h M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c M src/libosmo-mgcp-client/mgcp_client_vty.c M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.ok 13 files changed, 132 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_common.h b/include/osmocom/mgcp/mgcp_common.h index eb6564f..b2c7370 100644 --- a/include/osmocom/mgcp/mgcp_common.h +++ b/include/osmocom/mgcp/mgcp_common.h @@ -49,6 +49,14 @@ MGCP_CONN_LOOPBACK = 4 | MGCP_CONN_RECV_SEND, }; +#define MGCP_X_OSMO_IGN_HEADER "X-Osmo-IGN:" + +/* Values should be bitwise-OR-able */ +enum mgcp_x_osmo_ign { + MGCP_X_OSMO_IGN_NONE = 0, + MGCP_X_OSMO_IGN_CALLID = 1, +}; + /* Ensure that the msg->l2h is NUL terminated. */ static inline int mgcp_msg_terminate_nul(struct msgb *msg) { diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 3876794..d834c09 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -90,6 +90,9 @@ /*! Memorize if this endpoint was choosen by the MGW (wildcarded, true) * or if the user has choosen the particular endpoint explicitly. */ bool wildcarded_req; + + /*! MGCP_X_OSMO_IGN_* flags from 'X-Osmo-IGN:' header */ + uint32_t x_osmo_ign; }; /*! Extract endpoint number for a given endpoint */ diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h index ed2dfb0..6c478e8 100644 --- a/include/osmocom/mgcp_client/mgcp_client.h +++ b/include/osmocom/mgcp_client/mgcp_client.h @@ -11,6 +11,8 @@ #define MGCP_CLIENT_REMOTE_ADDR_DEFAULT "127.0.0.1" #define MGCP_CLIENT_REMOTE_PORT_DEFAULT 2427 +#define MGCP_CLIENT_MGW_STR "Configure MGCP connection to Media Gateway\n" + struct msgb; struct vty; struct mgcp_client; @@ -88,6 +90,7 @@ #define MGCP_MSG_PRESENCE_AUDIO_IP 0x0008 #define MGCP_MSG_PRESENCE_AUDIO_PORT 0x0010 #define MGCP_MSG_PRESENCE_CONN_MODE 0x0020 +#define MGCP_MSG_PRESENCE_X_OSMO_IGN 0x8000 struct mgcp_msg { enum mgcp_verb verb; @@ -104,6 +107,7 @@ unsigned int codecs_len; struct ptmap ptmap[MGCP_MAX_CODECS]; unsigned int ptmap_len; + uint32_t x_osmo_ign; }; void mgcp_client_conf_init(struct mgcp_client_conf *conf); diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index 81d3dea..bb07872 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -42,6 +42,11 @@ /*! RTP payload type map length (optional, only needed when payload * types are used that differ from what IANA/3GPP defines) */ unsigned int ptmap_len; + + /*! If nonzero, send 'X-Osmo-IGN:' header. This is useful e.g. for SCCPlite MSCs where the MSC is + * known to issue incoherent or unknown CallIDs / to issue CRCX commands with a different domain + * name than the BSC. An OsmoMGW will then ignore these and not fail on mismatches. */ + uint32_t x_osmo_ign; }; struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, uint32_t parent_term_evt, diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index c10abc9..e9d7b3f 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1313,6 +1313,13 @@ msgb_printf(msg, "M: %s\r\n", mgcp_client_cmode_name(mgcp_msg->conn_mode)); + /* Add X-Osmo-IGN */ + if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_X_OSMO_IGN) + && (mgcp_msg->x_osmo_ign != 0)) + rc += + msgb_printf(msg, MGCP_X_OSMO_IGN_HEADER "%s\r\n", + mgcp_msg->x_osmo_ign & MGCP_X_OSMO_IGN_CALLID ? " C": ""); + /* Add session description protocol (SDP) */ if (use_sdp && (mgcp_msg->verb == MGCP_VERB_CRCX diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 770db5e..0b5a251 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -119,6 +119,11 @@ osmo_strlcpy(mgcp_msg->endpoint, info->endpoint, MGCP_ENDPOINT_MAXLEN); memcpy(mgcp_msg->codecs, info->codecs, sizeof(mgcp_msg->codecs)); memcpy(mgcp_msg->ptmap, info->ptmap, sizeof(mgcp_msg->ptmap)); + + if (info->x_osmo_ign) { + mgcp_msg->x_osmo_ign = info->x_osmo_ign; + mgcp_msg->presence |= MGCP_MSG_PRESENCE_X_OSMO_IGN; + } } static void add_audio(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info) diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 10d078a..48fcd70 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -30,7 +30,7 @@ #include -#define MGW_STR "Configure MGCP connection to Media Gateway\n" +#define MGW_STR MGCP_CLIENT_MGW_STR void *global_mgcp_client_ctx = NULL; struct mgcp_client_conf *global_mgcp_client_conf = NULL; diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index a5bef7b..a7c8b47 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -407,6 +407,11 @@ if (!endp) return -1; + + /* Accept any CallID for "X-Osmo-IGN: C" */ + if (endp->x_osmo_ign & MGCP_X_OSMO_IGN_CALLID) + return 0; + if (!callid) return -1; if (!endp->callid) diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index ea80907..cb2c965 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -715,12 +715,31 @@ mode = (const char *)line + 3; break; case 'X': - /* If osmoux is disabled, just skip setting it up */ - if (!p->endp->cfg->osmux) - break; - if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == - 0) + if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { + /* If osmux is disabled, just skip setting it up */ + if (!p->endp->cfg->osmux) + break; osmux_cid = mgcp_osmux_setup(endp, line); + break; + } + + /* Parse X-Osmo-IGN header */ + if (!strncmp(line, MGCP_X_OSMO_IGN_HEADER, + strlen(MGCP_X_OSMO_IGN_HEADER))) { + int i; + int line_len = strlen(line); + for (i = strlen(MGCP_X_OSMO_IGN_HEADER); i < line_len; i++) { + switch (line[i]) { + case 'C': + endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + break; + default: + break; + } + } + break; + } + /* Ignore unknown X-headers */ break; case '\0': have_sdp = 1; diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index ea79485..2d1e28a 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -309,6 +309,32 @@ "a=rtpmap:97 GSM-EFR/8000\r\n" \ "a=ptime:20\r\n" +#define CRCX_X_OSMO_IGN \ + "CRCX 2 1 at mgw MGCP 1.0\r\n" \ + "M: recvonly\r\n" \ + "C: 2\r\n" \ + "L: p:20\r\n" \ + "X-Osmo-IGN: C\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "c=IN IP4 123.12.12.123\r\n" \ + "m=audio 5904 RTP/AVP 97\r\n" \ + "a=rtpmap:97 GSM-EFR/8000\r\n" \ + "a=ptime:40\r\n" + +#define CRCX_X_OSMO_IGN_RET \ + "200 2 OK\r\n" \ + "I: %s\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "o=- %s 23 IN IP4 0.0.0.0\r\n" \ + "s=-\r\n" \ + "c=IN IP4 0.0.0.0\r\n" \ + "t=0 0\r\n" \ + "m=audio 16010 RTP/AVP 97\r\n" \ + "a=rtpmap:97 GSM-EFR/8000\r\n" \ + "a=ptime:40\r\n" + #define DLCX \ "DLCX 7 1 at mgw MGCP 1.0\r\n" \ "I: %s\r\n" \ @@ -482,6 +508,7 @@ "a=fmtp:126 0/1/2"}, {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE,.extra_fmtp = "a=fmtp:126 0/1/2"}, {"CRCX", CRCX_NO_LCO_NO_SDP, CRCX_NO_LCO_NO_SDP_RET, 97}, + {"CRCX", CRCX_X_OSMO_IGN, CRCX_X_OSMO_IGN_RET, 97}, }; static const struct mgcp_test retransmit[] = { diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 9838f4d..bdaf5d7 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -427,6 +427,29 @@ M: recvonly C: 2 L: p:20 +X-Osmo-IGN: C + +v=0 +c=IN IP4 123.12.12.123 +m=audio 5904 RTP/AVP 97 +a=rtpmap:97 GSM-EFR/8000 +a=ptime:40 + +---------8<--------- +checking response: +using message with patched conn_id for comparison +Response matches our expectations. +(response does not contain a connection id) +Dummy packets: 2 + +================================================ +Testing CRCX +creating message from statically defined input: +---------8<--------- +CRCX 2 1 at mgw MGCP 1.0 +M: recvonly +C: 2 +L: p:20 v=0 c=IN IP4 123.12.12.123 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 9978f79..2662fc1 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -180,7 +180,8 @@ .codecs_len = 1, .ptmap[0].codec = CODEC_GSMEFR_8000_1, .ptmap[0].pt = 96, - .ptmap_len = 1 + .ptmap_len = 1, + .x_osmo_ign = MGCP_X_OSMO_IGN_CALLID, }; if (mgcp) @@ -268,6 +269,16 @@ msg = mgcp_msg_gen(mgcp, &mgcp_msg); printf("%s\n", (char *)msg->data); + printf("Generate X-Osmo-IGN message:\n"); + msg = mgcp_msg_gen(mgcp, &mgcp_msg); + mgcp_msg.verb = MGCP_VERB_CRCX; + mgcp_msg.presence = + (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | + MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE + | MGCP_MSG_PRESENCE_X_OSMO_IGN); + msg = mgcp_msg_gen(mgcp, &mgcp_msg); + printf("%s\n", (char *)msg->data); + printf("Overfolow test:\n"); mgcp_msg.verb = MGCP_VERB_MDCX; mgcp_msg.presence = diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok index 454ee3d..58c4b82 100644 --- a/tests/mgcp_client/mgcp_client_test.ok +++ b/tests/mgcp_client/mgcp_client_test.ok @@ -117,6 +117,14 @@ Generated RSIP message: RSIP 9 23 at mgw MGCP 1.0 +Generate X-Osmo-IGN message: +CRCX 11 23 at mgw MGCP 1.0 +C: 2f +I: 11 +L: p:20, a:GSM, nt:IN +M: sendrecv +X-Osmo-IGN: C + Overfolow test: -- To view, visit https://gerrit.osmocom.org/10585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 Gerrit-Change-Number: 10585 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Aug 26 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 26 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#227?= Message-ID: <889230819.32.1535296206726.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Aug 26 15:35:17 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 26 Aug 2018 15:35:17 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10617 Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... OsmocomBB: Add lua5.3 for the scriping interface Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M docker/Dockerfile.deb8_amd64 M docker/Dockerfile.deb8_i386 M docker/Dockerfile_osmocom_jenkins.amd64 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/10617/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 733866c..96243fc 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -64,6 +64,7 @@ - libgnutls28-dev - libgps-dev - libgsm1-dev + - liblua5.3-dev - libmnl-dev - libncurses5-dev - libortp-dev diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64 index f32a3c3..2bd0e93 100644 --- a/docker/Dockerfile.deb8_amd64 +++ b/docker/Dockerfile.deb8_amd64 @@ -26,8 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev libusb-1.0-0-dev libtalloc-dev # OsmocomBB -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi - +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev # building RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf stow diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386 index c9b3aa9..92a7d23 100644 --- a/docker/Dockerfile.deb8_i386 +++ b/docker/Dockerfile.deb8_i386 @@ -29,7 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libusb-1.0-0-dev libssl-dev libtalloc-dev # OsmocomBB -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev # for osmo-python-tests RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 12154b3..043fd86 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -26,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev libusb-1.0-0-dev libtalloc-dev libgnutls28-dev # OsmocomBB -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev # building RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Aug 26 19:55:26 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Aug 2018 19:55:26 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b8305b45c950_798110ae67c89948e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_8.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 64s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 64s] make -C firmware BOARD=simtrace APP=dfu [ 64s] make[2]: Entering directory '/usr/src/packages/BUILD/firmware' [ 64s] gcc usbstring/usbstring.c -o usbstring/usbstring [ 64s] cat apps/dfu/usb_strings.txt | usbstring/usbstring > apps/dfu/usb_strings_generated.h [ 64s] mkdir -p bin [ 64s] mkdir -p obj/simtrace [ 64s] [COMPILING libosmocore/source/panic.c] [ 64s] arm-none-eabi-gcc: error: unrecognized command line option '-fstack-protector-strong' [ 64s] Makefile:224: recipe for target 'obj/simtrace/flash_panic.o' failed [ 64s] make[2]: *** [obj/simtrace/flash_panic.o] Error 1 [ 64s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 64s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 64s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 64s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 64s] dh_auto_build: make -j1 returned exit code 2 [ 64s] debian/rules:4: recipe for target 'build' failed [ 64s] make: *** [build] Error 2 [ 64s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 64s] [ 64s] lamb08 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 19:55:19 UTC 2018. [ 64s] [ 64s] ### VM INTERACTION START ### [ 66s] Powering off. [ 66s] [ 55.535448] reboot: Power down [ 66s] ### VM INTERACTION END ### [ 66s] [ 66s] lamb08 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 19:55:22 UTC 2018. [ 66s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun Aug 26 19:56:01 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 26 Aug 2018 19:56:01 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b8305d3c06ea_798110ae67c89955b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_8.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 66s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 66s] make -C firmware BOARD=simtrace APP=dfu [ 66s] make[2]: Entering directory '/usr/src/packages/BUILD/firmware' [ 66s] gcc usbstring/usbstring.c -o usbstring/usbstring [ 66s] cat apps/dfu/usb_strings.txt | usbstring/usbstring > apps/dfu/usb_strings_generated.h [ 66s] mkdir -p bin [ 66s] mkdir -p obj/simtrace [ 66s] [COMPILING libosmocore/source/panic.c] [ 66s] arm-none-eabi-gcc: error: unrecognized command line option '-fstack-protector-strong' [ 66s] Makefile:224: recipe for target 'obj/simtrace/flash_panic.o' failed [ 66s] make[2]: *** [obj/simtrace/flash_panic.o] Error 1 [ 66s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 66s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 66s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 66s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 66s] dh_auto_build: make -j1 returned exit code 2 [ 66s] debian/rules:4: recipe for target 'build' failed [ 66s] make: *** [build] Error 2 [ 66s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 66s] [ 66s] lamb60 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 19:55:43 UTC 2018. [ 66s] [ 66s] ### VM INTERACTION START ### [ 67s] Powering off. [ 67s] [ 56.466552] reboot: Power down [ 67s] ### VM INTERACTION END ### [ 67s] [ 67s] lamb60 failed "build simtrace2_0.5.1.dsc" at Sun Aug 26 19:55:45 UTC 2018. [ 67s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Aug 26 20:36:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 26 Aug 2018 20:36:38 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10617 ) Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 26 Aug 2018 20:36:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 21:16:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 26 Aug 2018 21:16:04 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10618 Change subject: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension ...................................................................... OsmoMGW: document the 'X-Osmo-IGN' MGCP extension Change-Id: If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 --- A OsmoMGW/chapters/mgcp_extensions.adoc M OsmoMGW/osmomgw-usermanual.adoc 2 files changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/18/10618/1 diff --git a/OsmoMGW/chapters/mgcp_extensions.adoc b/OsmoMGW/chapters/mgcp_extensions.adoc new file mode 100644 index 0000000..86ff643 --- /dev/null +++ b/OsmoMGW/chapters/mgcp_extensions.adoc @@ -0,0 +1,68 @@ +== MGCP Extensions + +The MGCP protocol is extendable. The following non-standard extensions are +understood by OsmoMGW. + +=== `X-Osmo-IGN` + +`X-Osmo-IGN` indicates to OsmoMGW that specific items of an endpoint should be +ignored, so that it is lenient on mismatching values that would normally +indicate collisions or configuration errors. + +==== `X-Osmo-IGN` Format + +The value part of X-Osmo-IGN must be one or more items separated by one or more +spaces. Each item consists of one or more non-whitespace characters. + +.Example: `X-Osmo-IGN` format with three ficticious items "X", "abc" and "123". +---- +X-Osmo-IGN: X abc 123 +---- + +`X-Osmo-IGN` must be issued in the MGCP section (typically as its last item), +before the SDP section starts. + +==== Supported `X-Osmo-IGN` Items + +Currently, the following `X-Osmo-IGN` items are supported: + +* `C`: ignore CallID mismatches, i.e. differing "C" values between connections + on the same endpoint. + +.Note: +`X-Osmo-IGN` does not support ignoring mismatches on the domain part of +an endpoint name, e.g. ignoring a mismatch on "example.com" in +`rtpbridge/123abc at example.com`. Instead, you may globally configure OsmoMGW +with `mgcp` / `domain *` to permit all domain parts. + +===== `X-Osmo-IGN: C` + +By default, OsmoMGW verifies that all CallIDs ("C" values) match for all +connections on any one given endpoint. To ignore CallID mismatches, pass a `C` +in the `X-Osmo-IGN` header, for the first or the second `CRCX` on an endpoint. +When the `X-Osmo-IGN: C` is sent for any one `CRCX` on an endpoint, CallID +mismatches will be ignored for that and all subsequent messages for that +endpoint. Hence this header only needs to be included once per endpoint, in any +`CRCX` message that precedes or coincides with a CallID mismatch. + +This is particularly useful for a BSC that is connected to an A/SCCPlite MSC, +where the BSC and MSC each are expected to configure their respective own +connection on a shared endpoint. For A/SCCPlite, it is impossible for the BSC +to know the CallID that the MSC will use, so CallID mismatches are inevitable. +See also OsmoBSC, which will by default pass the `X-Osmo-IGN: C` header for +endpoints associated with an A/SCCPlite MSC. + +.Example: `CRCX` message that instructs OsmoMGW to ignore CallID mismatches +---- +CRCX 2 rtpbridge/123abc at mgw MGCP 1.0 +M: recvonly +C: 2 +L: p:20 +X-Osmo-IGN: C + +v=0 +c=IN IP4 123.12.12.123 +m=audio 5904 RTP/AVP 97 +a=rtpmap:97 GSM-EFR/8000 +a=ptime:40 +---- diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc index 69dc005..6030023 100644 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ b/OsmoMGW/osmomgw-usermanual.adoc @@ -18,6 +18,8 @@ include::chapters/configuration.adoc[] +include::chapters/mgcp_extensions.adoc[] + //include::chapters/counters.adoc[] include::../common/chapters/port_numbers.adoc[] -- To view, visit https://gerrit.osmocom.org/10618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 Gerrit-Change-Number: 10618 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 21:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 26 Aug 2018 21:48:39 +0000 Subject: Change in osmo-mgw[master]: X-Osmo-IGN: rather parse items by token, not char Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10619 Change subject: X-Osmo-IGN: rather parse items by token, not char ...................................................................... X-Osmo-IGN: rather parse items by token, not char Adjust the X-Osmo-IGN parsing to use string tokens instead of parsing single characters. Reconsidering the first implementation as a poor choice, rather specify the format of X-Osmo-IGN as any-length string tokens separated by spaces, which is more flexible and more future proof. See also osmo-gsm-manuals If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 which defines the X-Osmo-IGN format as string tokens, matching this patch. In mgcp_test, add an unknown X-Osmo-IGN item. Though the output is not checked by the testsuite.at, running manually shows the error log about the unkown X-Osmo-IGN item. Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c --- M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 28 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/10619/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index cb2c965..cd2f08e 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -674,6 +674,30 @@ return 534; } +bool parse_x_osmo_ign(struct mgcp_endpoint *endp, char *line) +{ + char *saveptr; + + if (strncmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) + return false; + line = line + strlen(MGCP_X_OSMO_IGN_HEADER); + + while (1) { + char *token = strtok_r(line, " ", &saveptr); + line = NULL; + if (!token) + break; + + if (!strcmp(token, "C")) + endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + else + LOGP(DLMGCP, LOGL_ERROR, "endpoint %x: received unknown X-Osmo-IGN item '%s'\n", + ENDPOINT_NUMBER(endp), token); + } + + return true; +} + /* CRCX command handler, processes the received command */ static struct msgb *handle_create_con(struct mgcp_parse_data *p) { @@ -723,22 +747,9 @@ break; } - /* Parse X-Osmo-IGN header */ - if (!strncmp(line, MGCP_X_OSMO_IGN_HEADER, - strlen(MGCP_X_OSMO_IGN_HEADER))) { - int i; - int line_len = strlen(line); - for (i = strlen(MGCP_X_OSMO_IGN_HEADER); i < line_len; i++) { - switch (line[i]) { - case 'C': - endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; - break; - default: - break; - } - } + if (parse_x_osmo_ign(endp, line)) break; - } + /* Ignore unknown X-headers */ break; case '\0': diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2d1e28a..f8f701e 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -314,7 +314,7 @@ "M: recvonly\r\n" \ "C: 2\r\n" \ "L: p:20\r\n" \ - "X-Osmo-IGN: C\r\n" \ + "X-Osmo-IGN: C foo\r\n" \ "\r\n" \ "v=0\r\n" \ "c=IN IP4 123.12.12.123\r\n" \ diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index bdaf5d7..fcad85a 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -427,7 +427,7 @@ M: recvonly C: 2 L: p:20 -X-Osmo-IGN: C +X-Osmo-IGN: C foo v=0 c=IN IP4 123.12.12.123 -- To view, visit https://gerrit.osmocom.org/10619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c Gerrit-Change-Number: 10619 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Aug 26 21:50:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 26 Aug 2018 21:50:56 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10618 to look at the new patch set (#2). Change subject: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension ...................................................................... OsmoMGW: document the 'X-Osmo-IGN' MGCP extension See also Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c in osmo-mgw.git, which changes the initial single-character implementation to match this specification of string tokens separated by spaces. Change-Id: If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 --- A OsmoMGW/chapters/mgcp_extensions.adoc M OsmoMGW/osmomgw-usermanual.adoc 2 files changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/18/10618/2 -- To view, visit https://gerrit.osmocom.org/10618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 Gerrit-Change-Number: 10618 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 01:30:47 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 27 Aug 2018 01:30:47 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10617 ) Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Mon, 27 Aug 2018 01:30:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 01:30:53 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 27 Aug 2018 01:30:53 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10617 ) Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Mon, 27 Aug 2018 01:30:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 07:00:49 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 27 Aug 2018 07:00:49 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10617 ) Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Mon, 27 Aug 2018 07:00:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 07:46:21 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 07:46:21 +0000 Subject: Change in pysim[master]: test Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10620 Change subject: test ...................................................................... test Change-Id: Ie9a6e760873140719c8fa57394f430117857265b --- A testme.txt 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/10620/1 diff --git a/testme.txt b/testme.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testme.txt -- To view, visit https://gerrit.osmocom.org/10620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9a6e760873140719c8fa57394f430117857265b Gerrit-Change-Number: 10620 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 07:56:48 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 27 Aug 2018 07:56:48 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10617 to look at the new patch set (#2). Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... OsmocomBB: Add lua5.3 for the scriping interface Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M docker/Dockerfile.deb8_amd64 M docker/Dockerfile.deb8_i386 M docker/Dockerfile_osmocom_jenkins.amd64 4 files changed, 31 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/10617/2 -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 08:06:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 08:06:54 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10620 to look at the new patch set (#2). Change subject: test ...................................................................... test Change-Id: Ie9a6e760873140719c8fa57394f430117857265b --- A testme.txt A testme2.txt 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/10620/2 -- To view, visit https://gerrit.osmocom.org/10620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie9a6e760873140719c8fa57394f430117857265b Gerrit-Change-Number: 10620 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 08:18:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 08:18:00 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10620 to look at the new patch set (#3). Change subject: test ...................................................................... test Change-Id: Ie9a6e760873140719c8fa57394f430117857265b --- A testme.txt A testme2.txt A testme3.txt 3 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/10620/3 -- To view, visit https://gerrit.osmocom.org/10620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie9a6e760873140719c8fa57394f430117857265b Gerrit-Change-Number: 10620 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 08:21:36 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 08:21:36 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10620 to look at the new patch set (#4). Change subject: test ...................................................................... test Change-Id: Ie9a6e760873140719c8fa57394f430117857265b --- A testme.txt A testme2.txt A testme3.txt A testme4.txt 4 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/10620/4 -- To view, visit https://gerrit.osmocom.org/10620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie9a6e760873140719c8fa57394f430117857265b Gerrit-Change-Number: 10620 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 08:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 08:34:41 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10620 to look at the new patch set (#5). Change subject: test ...................................................................... test Change-Id: Ie9a6e760873140719c8fa57394f430117857265b --- A testme.txt A testme2.txt A testme3.txt A testme4.txt A testme5.txt 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/20/10620/5 -- To view, visit https://gerrit.osmocom.org/10620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie9a6e760873140719c8fa57394f430117857265b Gerrit-Change-Number: 10620 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 08:43:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 08:43:50 +0000 Subject: Change in pysim[master]: test In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/10620 ) Change subject: test ...................................................................... Abandoned This was a test. -- To view, visit https://gerrit.osmocom.org/10620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ie9a6e760873140719c8fa57394f430117857265b Gerrit-Change-Number: 10620 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 10:33:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 10:33:36 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc: Parametrize codec-list VTY cfg Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10621 Change subject: osmo-bsc: Parametrize codec-list VTY cfg ...................................................................... osmo-bsc: Parametrize codec-list VTY cfg Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 --- M example/defaults.conf A example/scenarios/cfg-codec-fr3.conf M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 5 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/21/10621/1 diff --git a/example/defaults.conf b/example/defaults.conf index 61b09fb..5bdf257 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -14,6 +14,8 @@ short_name: osmo-gsm-tester-msc long_name: osmo-gsm-tester-msc encryption: a5_0 + codec_list: + - hr3 msc: net: diff --git a/example/scenarios/cfg-codec-fr3.conf b/example/scenarios/cfg-codec-fr3.conf new file mode 100644 index 0000000..fcc47cc --- /dev/null +++ b/example/scenarios/cfg-codec-fr3.conf @@ -0,0 +1,5 @@ +config: + bsc: + net: + codec_list: + - fr3 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index e4e2f9d..d12c7c6 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -87,7 +87,8 @@ RESOURCES_SCHEMA) CONF_SCHEMA = util.dict_add( - { 'defaults.timeout': schema.STR }, + { 'defaults.timeout': schema.STR, + 'config.config.bsc.net.codec_list[]': schema.CODEC }, dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()]), dict([('modifiers.%s' % key, val) for key, val in WANT_SCHEMA.items()])) diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 4a15bcd..174c28f 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -110,6 +110,11 @@ return raise ValueError('Unknown Channel Allocator Policy %r' % val) +def codec(val): + if val in ('hr1', 'hr2', 'hr3', 'fr1', 'fr2', 'fr3'): + return + raise ValueError('Unknown Codec value: %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -126,6 +131,7 @@ MODEM_FEATURE = 'modem_feature' PHY_CHAN = 'chan' CHAN_ALLOCATOR = 'chan_allocator' +CODEC = 'codec' SCHEMA_TYPES = { INT: int, @@ -144,6 +150,7 @@ MODEM_FEATURE: modem_feature, PHY_CHAN: phy_channel_config, CHAN_ALLOCATOR: channel_allocator, + CODEC: codec, } def validate(config, schema): diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index edcf33f..95bf5e3 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -110,7 +110,7 @@ mgw remote-port 2427 mgw local-ip ${bsc.ip_address.addr} mgw endpoint-range 1 31 - codec-list hr3 + codec-list ${' '.join(bsc.net.codec_list)} amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden -- To view, visit https://gerrit.osmocom.org/10621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 Gerrit-Change-Number: 10621 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 10:34:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 10:34:09 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc: Parametrize codec-list VTY cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10621 ) Change subject: osmo-bsc: Parametrize codec-list VTY cfg ...................................................................... Patch Set 1: WIP, pushed accidentally. -- To view, visit https://gerrit.osmocom.org/10621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 Gerrit-Change-Number: 10621 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 27 Aug 2018 10:34:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 11:03:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 11:03:28 +0000 Subject: Change in osmocom-bb[master]: cosmetic: fix typo Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10622 Change subject: cosmetic: fix typo ...................................................................... cosmetic: fix typo Change-Id: Ib9c5cb1aa0aaf12b68f9d93f9ce9a27037b84a56 --- M src/host/virt_phy/src/virt_l1_model.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/10622/1 diff --git a/src/host/virt_phy/src/virt_l1_model.c b/src/host/virt_phy/src/virt_l1_model.c index 6a9fa99..5738bed 100644 --- a/src/host/virt_phy/src/virt_l1_model.c +++ b/src/host/virt_phy/src/virt_l1_model.c @@ -45,7 +45,7 @@ void l1_model_ms_destroy(struct l1_model_ms *model) { - LOGPMS(DMAIN, LOGL_INFO, model, "destryed\n"); + LOGPMS(DMAIN, LOGL_INFO, model, "destroyed\n"); l1ctl_sap_exit(model); talloc_free(model); } -- To view, visit https://gerrit.osmocom.org/10622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9c5cb1aa0aaf12b68f9d93f9ce9a27037b84a56 Gerrit-Change-Number: 10622 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 11:03:29 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 27 Aug 2018 11:03:29 +0000 Subject: Change in osmocom-bb[master]: cosmetic: add commandline help Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10623 Change subject: cosmetic: add commandline help ...................................................................... cosmetic: add commandline help There is no helptext for the commandline options, which makes it difficult for new users to use the program. - Add commandline help Change-Id: I8d04644342acd64432742f96e32dc9f2e0e91c20 --- M src/host/virt_phy/src/virtphy.c 1 file changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/23/10623/1 diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c index 153f890..118e8a1 100644 --- a/src/host/virt_phy/src/virtphy.c +++ b/src/host/virt_phy/src/virtphy.c @@ -60,11 +60,30 @@ static char *arfcn_sig_lev_red_mask = NULL; static char *pm_timeout = NULL; +static void print_usage() +{ + printf("Usage: virtphy\n"); +} + +static void print_help() +{ + printf(" Some useful help...\n"); + printf(" -h --help This text.\n"); + printf(" -z --dl-rx-grp ms multicast group.\n"); + printf(" -y --ul-tx-grp bts multicast group.\n"); + printf(" -x --port udp port to use for communication with virtual BTS (GSMTAP)\n"); + printf(" -d --log-mask --log-mask=DRLL:DCC enable debugging.\n"); + printf(" -s --l1ctl-sock l1ctl socket path path.\n"); + printf(" -r --arfcn-sig-lev-red reduce signal level (e.g. 666,12:888,43:176,22).\n"); + printf(" -t --pm-timeout power management timeout.\n"); +} + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; static struct option long_options[] = { + {"help", 0, 0, 'h'}, {"dl-rx-grp", required_argument, 0, 'z'}, {"ul-tx-grp", required_argument, 0, 'y'}, {"port", required_argument, 0, 'x'}, @@ -74,12 +93,16 @@ {"pm-timeout", required_argument, 0, 't'}, {0, 0, 0, 0}, }; - c = getopt_long(argc, argv, "z:y:x:d:s:r:t:", long_options, + c = getopt_long(argc, argv, "hz:y:x:d:s:r:t:", long_options, &option_index); if (c == -1) break; switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); case 'z': dl_rx_grp = optarg; break; -- To view, visit https://gerrit.osmocom.org/10623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8d04644342acd64432742f96e32dc9f2e0e91c20 Gerrit-Change-Number: 10623 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 11:50:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 11:50:07 +0000 Subject: Change in osmocom-bb[master]: cosmetic: add commandline help In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10623 ) Change subject: cosmetic: add commandline help ...................................................................... Patch Set 1: Code-Review-1 I think we should stop tagging all these kind of commits as cosmetic, because they definitely are not cosmetic: They change code, logic, and generated binary. -- To view, visit https://gerrit.osmocom.org/10623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d04644342acd64432742f96e32dc9f2e0e91c20 Gerrit-Change-Number: 10623 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 27 Aug 2018 11:50:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 12:24:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 12:24:50 +0000 Subject: Change in osmo-gsm-tester[master]: suite: Fix generation of config() dictionary Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10624 Change subject: suite: Fix generation of config() dictionary ...................................................................... suite: Fix generation of config() dictionary suite.config() hasn't been activetly used anywere. New upcoming patches will start using it to set and overlay config parameters for objects which are not necessarily allocated as resources. Since these options don't apply to specific resources, there's no sense in running replicate_times() on them. Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e --- M src/osmo_gsm_tester/suite.py 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/24/10624/1 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index fa86f96..3a49574 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -126,14 +126,18 @@ self.duration = 0 self.status = SuiteRun.UNKNOWN - def combined(self, conf_name): + def combined(self, conf_name, replicate_times=True): log.dbg(combining=conf_name) log.ctx(combining_scenarios=conf_name) - combination = config.replicate_times(self.definition.conf.get(conf_name, {})) + combination = self.definition.conf.get(conf_name, {}) + if replicate_times: + combination = config.replicate_times(combination) log.dbg(definition_conf=combination) for scenario in self.scenarios: log.ctx(combining_scenarios=conf_name, scenario=scenario.name()) - c = config.replicate_times(scenario.get(conf_name, {})) + c = scenario.get(conf_name, {}) + if replicate_times: + c = config.replicate_times(c) log.dbg(scenario=scenario.name(), conf=c) if c is None: continue @@ -162,7 +166,7 @@ def config(self): if self._config is None: - self._config = self.combined('config') + self._config = self.combined('config', False) return self._config def reserve_resources(self): -- To view, visit https://gerrit.osmocom.org/10624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e Gerrit-Change-Number: 10624 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 12:24:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 12:24:51 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add suites testing different codecs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10625 Change subject: default-suites: Add suites testing different codecs ...................................................................... default-suites: Add suites testing different codecs Change-Id: I591c71c66c5bbcd07466fe1d433aa87aed964fbe --- M example/default-suites.conf 1 file changed, 36 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/25/10625/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 8d692fa..37de6a2 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -2,8 +2,12 @@ - aoip_sms:sysmo - ussd:sysmo - aoip_ussd:sysmo -- voice:sysmo+mod-bts0-ts-tchf -- voice:sysmo+mod-bts0-ts-tchh +- voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:sysmo+mod-bts0-dynts-ipa - voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo @@ -13,8 +17,12 @@ - aoip_sms:trx-b200 - ussd:trx-b200 - aoip_ussd:trx-b200 -- voice:trx-b200+mod-bts0-ts-tchf -- voice:trx-b200+mod-bts0-ts-tchh +- voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-b200+mod-bts0-dynts-ipa - voice:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200 @@ -24,8 +32,12 @@ - aoip_sms:trx-sysmocell5000 - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 -- voice:trx-sysmocell5000+mod-bts0-ts-tchf -- voice:trx-sysmocell5000+mod-bts0-ts-tchh +- voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-sysmocell5000+mod-bts0-dynts-ipa - voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 @@ -35,23 +47,35 @@ - aoip_sms:octphy - ussd:octphy - aoip_ussd:octphy -- voice:octphy+mod-bts0-ts-tchf -- voice:octphy+mod-bts0-ts-tchh +- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr3 - gprs:octphy - sms:nanobts - aoip_sms:nanobts+band-1900 - ussd:nanobts+band-1900 - aoip_ussd:nanobts+band-1900 -- voice:nanobts+band-1900+mod-bts0-ts-tchf -- voice:nanobts+band-1900+mod-bts0-ts-tchh +- voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa - aoip_sms:nanobts+band-900 - ussd:nanobts+band-900 - aoip_ussd:nanobts+band-900 -- voice:nanobts+band-900+mod-bts0-ts-tchf -- voice:nanobts+band-900+mod-bts0-ts-tchh +- voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:nanobts+band-900+mod-bts0-dynts-ipa - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 -- To view, visit https://gerrit.osmocom.org/10625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I591c71c66c5bbcd07466fe1d433aa87aed964fbe Gerrit-Change-Number: 10625 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 12:24:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 12:24:51 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove octobts tests Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10626 Change subject: default-suites: Remove octobts tests ...................................................................... default-suites: Remove octobts tests Since latest release firmware, we have been unable to start up octobts correctly. As it's annoying having all those tests failing all the time, let's disable them in nightly builds until we have a working OctoBTS setup working again. Change-Id: I828723193564b3a91aeac0c163c7c8c6b7e4058c --- M example/default-suites.conf 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/26/10626/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 37de6a2..258d187 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -43,17 +43,6 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- sms:octphy -- aoip_sms:octphy -- ussd:octphy -- aoip_ussd:octphy -- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr1 -- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr2 -- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr3 -- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr1 -- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr2 -- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr3 -- gprs:octphy - sms:nanobts - aoip_sms:nanobts+band-1900 - ussd:nanobts+band-1900 -- To view, visit https://gerrit.osmocom.org/10626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I828723193564b3a91aeac0c163c7c8c6b7e4058c Gerrit-Change-Number: 10626 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 12:25:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 12:25:26 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc: Parametrize codec-list VTY cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10621 ) Change subject: osmo-bsc: Parametrize codec-list VTY cfg ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 Gerrit-Change-Number: 10621 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 27 Aug 2018 12:25:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 14:48:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 27 Aug 2018 14:48:20 +0000 Subject: Change in osmocom-bb[master]: cosmetic: fix typo In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10622 ) Change subject: cosmetic: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9c5cb1aa0aaf12b68f9d93f9ce9a27037b84a56 Gerrit-Change-Number: 10622 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 27 Aug 2018 14:48:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 14:48:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 27 Aug 2018 14:48:23 +0000 Subject: Change in osmocom-bb[master]: cosmetic: fix typo In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10622 ) Change subject: cosmetic: fix typo ...................................................................... cosmetic: fix typo Change-Id: Ib9c5cb1aa0aaf12b68f9d93f9ce9a27037b84a56 --- M src/host/virt_phy/src/virt_l1_model.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/virt_phy/src/virt_l1_model.c b/src/host/virt_phy/src/virt_l1_model.c index 6a9fa99..5738bed 100644 --- a/src/host/virt_phy/src/virt_l1_model.c +++ b/src/host/virt_phy/src/virt_l1_model.c @@ -45,7 +45,7 @@ void l1_model_ms_destroy(struct l1_model_ms *model) { - LOGPMS(DMAIN, LOGL_INFO, model, "destryed\n"); + LOGPMS(DMAIN, LOGL_INFO, model, "destroyed\n"); l1ctl_sap_exit(model); talloc_free(model); } -- To view, visit https://gerrit.osmocom.org/10622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib9c5cb1aa0aaf12b68f9d93f9ce9a27037b84a56 Gerrit-Change-Number: 10622 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 14:48:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 27 Aug 2018 14:48:37 +0000 Subject: Change in osmocom-bb[master]: cosmetic: add commandline help In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10623 ) Change subject: cosmetic: add commandline help ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d04644342acd64432742f96e32dc9f2e0e91c20 Gerrit-Change-Number: 10623 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 27 Aug 2018 14:48:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 14:48:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 27 Aug 2018 14:48:38 +0000 Subject: Change in osmocom-bb[master]: cosmetic: add commandline help In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10623 ) Change subject: cosmetic: add commandline help ...................................................................... cosmetic: add commandline help There is no helptext for the commandline options, which makes it difficult for new users to use the program. - Add commandline help Change-Id: I8d04644342acd64432742f96e32dc9f2e0e91c20 --- M src/host/virt_phy/src/virtphy.c 1 file changed, 24 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Objections: Pau Espin Pedrol: I would prefer this is not merged as is diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c index 153f890..118e8a1 100644 --- a/src/host/virt_phy/src/virtphy.c +++ b/src/host/virt_phy/src/virtphy.c @@ -60,11 +60,30 @@ static char *arfcn_sig_lev_red_mask = NULL; static char *pm_timeout = NULL; +static void print_usage() +{ + printf("Usage: virtphy\n"); +} + +static void print_help() +{ + printf(" Some useful help...\n"); + printf(" -h --help This text.\n"); + printf(" -z --dl-rx-grp ms multicast group.\n"); + printf(" -y --ul-tx-grp bts multicast group.\n"); + printf(" -x --port udp port to use for communication with virtual BTS (GSMTAP)\n"); + printf(" -d --log-mask --log-mask=DRLL:DCC enable debugging.\n"); + printf(" -s --l1ctl-sock l1ctl socket path path.\n"); + printf(" -r --arfcn-sig-lev-red reduce signal level (e.g. 666,12:888,43:176,22).\n"); + printf(" -t --pm-timeout power management timeout.\n"); +} + static void handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; static struct option long_options[] = { + {"help", 0, 0, 'h'}, {"dl-rx-grp", required_argument, 0, 'z'}, {"ul-tx-grp", required_argument, 0, 'y'}, {"port", required_argument, 0, 'x'}, @@ -74,12 +93,16 @@ {"pm-timeout", required_argument, 0, 't'}, {0, 0, 0, 0}, }; - c = getopt_long(argc, argv, "z:y:x:d:s:r:t:", long_options, + c = getopt_long(argc, argv, "hz:y:x:d:s:r:t:", long_options, &option_index); if (c == -1) break; switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); case 'z': dl_rx_grp = optarg; break; -- To view, visit https://gerrit.osmocom.org/10623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8d04644342acd64432742f96e32dc9f2e0e91c20 Gerrit-Change-Number: 10623 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 14:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 27 Aug 2018 14:49:17 +0000 Subject: Change in osmocom-bb[master]: cosmetic: add commandline help In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10623 ) Change subject: cosmetic: add commandline help ...................................................................... Patch Set 1: I agree it's not necessarily a cosmetic change, but apart from that it's a useful patch that could be merged as-is -- To view, visit https://gerrit.osmocom.org/10623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d04644342acd64432742f96e32dc9f2e0e91c20 Gerrit-Change-Number: 10623 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 27 Aug 2018 14:49:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 14:50:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 27 Aug 2018 14:50:18 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10617 ) Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Mon, 27 Aug 2018 14:50:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 14:50:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 14:50:26 +0000 Subject: Change in osmo-trx[master]: vty: Fix typo in gpsdo clock reference type Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10627 Change subject: vty: Fix typo in gpsdo clock reference type ...................................................................... vty: Fix typo in gpsdo clock reference type Change-Id: I3f553c2cec9689524728cacb15b7daaff8166925 --- M CommonLibs/trx_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/27/10627/1 diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index baa26c8..45b58eb 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -39,7 +39,7 @@ static const struct value_string clock_ref_names[] = { { REF_INTERNAL, "internal" }, { REF_EXTERNAL, "external" }, - { REF_GPS, "gspdo" }, + { REF_GPS, "gpsdo" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/10627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3f553c2cec9689524728cacb15b7daaff8166925 Gerrit-Change-Number: 10627 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Aug 27 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 27 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#228?= In-Reply-To: <889230819.32.1535296206726.JavaMail.jenkins@jenkins.osmocom.org> References: <889230819.32.1535296206726.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <934317247.46.1535382606500.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Aug 27 17:33:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 17:33:53 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add extra IP for LimeSDR Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10628 Change subject: ansible: gsm-tester: Add extra IP for LimeSDR ...................................................................... ansible: gsm-tester: Add extra IP for LimeSDR Change-Id: Ic0fddfc0eaf884cdd5436139675a5a19fafa96b9 --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/28/10628/1 diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index a4c86a4..c849210 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -58,3 +58,8 @@ iface {{ bts_interface }}:10 inet static address 10.42.42.52 netmask 255.255.255.0 + +auto {{ bts_interface }}:11 +iface {{ bts_interface }}:11 inet static + address 10.42.42.53 + netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/10628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0fddfc0eaf884cdd5436139675a5a19fafa96b9 Gerrit-Change-Number: 10628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 17:33:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 27 Aug 2018 17:33:54 +0000 Subject: Change in osmo-ci[master]: ansible: osmocom_build_deps: Add cmake Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10629 Change subject: ansible: osmocom_build_deps: Add cmake ...................................................................... ansible: osmocom_build_deps: Add cmake cmake is required to build LimeSuite, and its not currently installed in the build slave. Change-Id: I1808a2394798cd11a0bee8f664c7d18fa71cd5b8 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/10629/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 733866c..2ad1ec8 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -44,6 +44,8 @@ # by gapk - libasound-dev - libopencore-amrnb-dev + # by LimeSuite + - cmake - name: install build dependencies and libraries apt: -- To view, visit https://gerrit.osmocom.org/10629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1808a2394798cd11a0bee8f664c7d18fa71cd5b8 Gerrit-Change-Number: 10629 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 17:46:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 27 Aug 2018 17:46:29 +0000 Subject: Change in osmo-trx[master]: vty: Fix typo in gpsdo clock reference type In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10627 ) Change subject: vty: Fix typo in gpsdo clock reference type ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f553c2cec9689524728cacb15b7daaff8166925 Gerrit-Change-Number: 10627 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 27 Aug 2018 17:46:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 18:30:47 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 27 Aug 2018 18:30:47 +0000 Subject: Change in docker-playground[master]: BSC_sccplite: Different network names for BSC AoIP/sccplite tests Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/10630 Change subject: BSC_sccplite: Different network names for BSC AoIP/sccplite tests ...................................................................... BSC_sccplite: Different network names for BSC AoIP/sccplite tests Change-Id: I9124340817888c02574735ab1b1c6c2df3e93212 --- M ttcn3-bsc-test/jenkins-sccplite.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/30/10630/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index a0e9e0c..bceb0ec 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -2,6 +2,9 @@ . ../jenkins-common.sh +#Make sure NET_NAME doesn't clash with the AoIP BSC test +NET_NAME=ttcn3-bsc_sccplite-test + mkdir $VOL_BASE_DIR/bsc-tester cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -- To view, visit https://gerrit.osmocom.org/10630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9124340817888c02574735ab1b1c6c2df3e93212 Gerrit-Change-Number: 10630 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 18:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 18:56:14 +0000 Subject: Change in libosmocore[master]: log: add 'last' option to 'logging print file' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10631 Change subject: log: add 'last' option to 'logging print file' ...................................................................... log: add 'last' option to 'logging print file' Allow printing the source file information *after* the log information. Add target->print_filename_pos, log_set_print_filename_pos() and enum log_filename_pos, and the optional 'last' keyword to the 'logging print file' vty command. (An enum in case we want to add other positions later.) Rationale: on log lines, the logging context is usually printed first in the logging text. Without the source file information, this logging context pretty much aligns in an easily readable way. When adding the source file information, each line's logging context info is shifted right by a pretty much random amount and it is hard to spot recurring logging contexts. One solution is to switch off source file info, of course, but that's not an option when actively hacking on bugs and new features. For example, it is unnecessarily hard to spot lchan FSM related log lines in this osmo-bsc log snippet: DRSL NOTICE mgw_endpoint_fsm.c:603 mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Freeing instance DRSL NOTICE fsm.c:381 mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Deallocated DMSC NOTICE mgw_endpoint_fsm.c:603 SUBSCR_CONN(conn0){CLEARING}: Received Event FORGET_MGW_ENDPOINT DCHAN DEBUG lchan_rtp_fsm.c:741 lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED DCHAN DEBUG lchan_rtp_fsm.c:520 lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Freeing instance DCHAN DEBUG fsm.c:381 lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Deallocated DCHAN DEBUG lchan_rtp_fsm.c:520 lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED DCHAN DEBUG lchan_fsm.c:1232 lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: state_chg to WAIT_RF_RELEASE_ACK DRSL NOTICE handover_fsm.c:762 handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DRSL NOTICE handover_fsm.c:762 handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Freeing instance DRSL NOTICE fsm.c:381 handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Deallocated DCHAN DEBUG lchan_fsm.c:1196 lchan(0-0-1-TCH_F-0){WAIT_RF_RELEASE_ACK}: state_chg to BORKEN DCHAN DEBUG lchan_fsm.c:354 lchan(0-0-1-TCH_F-0){BORKEN}: (type=TCH_F) Clearing lchan state DLMGCP DEBUG mgcp_client.c:741 Tx MGCP msg to MGCP GW: 'DLCX 3 2 at mgw MGCP 1.0' DLMGCP DEBUG mgcp_client.c:743 Sending msg to MGCP GW size: 66 DRLL NOTICE mgcp_client_fsm.c:422 MGCP_CONN(to-BTS){ST_DLCX_RESP}: Received Event EV_DLCX_RESP Placing the source file info behind the log text makes it much easier to follow, while the source file info is still available: DRSL NOTICE mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Freeing instance (mgw_endpoint_fsm.c:603) DRSL NOTICE mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Deallocated (fsm.c:381) DMSC NOTICE SUBSCR_CONN(conn0){CLEARING}: Received Event FORGET_MGW_ENDPOINT (mgw_endpoint_fsm.c:603) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED (lchan_rtp_fsm.c:741) DCHAN DEBUG lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Freeing instance (lchan_rtp_fsm.c:520) DCHAN DEBUG lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Deallocated (fsm.c:381) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED (lchan_rtp_fsm.c:520) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: state_chg to WAIT_RF_RELEASE_ACK (lchan_fsm.c:1232) DRSL NOTICE handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Terminating (cause = OSMO_FSM_TERM_REGULAR) (handover_fsm.c:745) DRSL NOTICE handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Freeing instance (handover_fsm.c:745) DRSL NOTICE handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Deallocated (fsm.c:381) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RF_RELEASE_ACK}: state_chg to BORKEN (lchan_fsm.c:1196) DCHAN DEBUG lchan(0-0-1-TCH_F-0){BORKEN}: (type=TCH_F) Clearing lchan state (lchan_fsm.c:354) DLMGCP DEBUG Tx MGCP msg to MGCP GW: 'DLCX 3 12 at mgw MGCP 1.0' (mgcp_client.c:741) DLMGCP DEBUG Sending msg to MGCP GW size: 67 (mgcp_client.c:743) DRLL NOTICE MGCP_CONN(to-BTS){ST_DLCX_RESP}: Received Event EV_DLCX_RESP (mgcp_client_fsm.c:422) Implementation: for 'last', insert source file info only when an '\n' is found at the end of the log line composition buffer, so that LOGP()...LOGPC() constructs also print source file info only when a log line actually ends. Change-Id: I393907b3c9e0cc1145e102328adad0a83ee13a9f --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c 3 files changed, 71 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/10631/1 diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 3cae63d..8464043 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -228,6 +228,12 @@ LOG_FILENAME_BASENAME, }; +/*! Where on a log line source file and line should be logged. */ +enum log_filename_pos { + LOG_FILENAME_POS_HEADER_END, + LOG_FILENAME_POS_LINE_END, +}; + /*! structure representing a logging target */ struct log_target { struct llist_head entry; /*!< linked list */ @@ -313,6 +319,8 @@ bool print_category_hex; /* Should we print the source file and line, and in which way? */ enum log_filename_type print_filename2; + /* Where on a log line to put the source file info. */ + enum log_filename_pos print_filename_pos; }; /* use the above macros */ @@ -335,6 +343,7 @@ void log_set_print_timestamp(struct log_target *target, int); void log_set_print_filename(struct log_target *target, int); void log_set_print_filename2(struct log_target *target, enum log_filename_type lft); +void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos); void log_set_print_category(struct log_target *target, int); void log_set_print_category_hex(struct log_target *target, int); void log_set_print_level(struct log_target *target, int); diff --git a/src/logging.c b/src/logging.c index edb2b56..de0f2b0 100644 --- a/src/logging.c +++ b/src/logging.c @@ -406,21 +406,24 @@ goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); } - switch (target->print_filename2) { - case LOG_FILENAME_NONE: - break; - case LOG_FILENAME_PATH: - ret = snprintf(buf + offset, rem, "%s:%d ", file, line); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - break; - case LOG_FILENAME_BASENAME: - ret = snprintf(buf + offset, rem, "%s:%d ", const_basename(file), line); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - break; + + if (target->print_filename_pos == LOG_FILENAME_POS_HEADER_END) { + switch (target->print_filename2) { + case LOG_FILENAME_NONE: + break; + case LOG_FILENAME_PATH: + ret = snprintf(buf + offset, rem, "%s:%d ", file, line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + case LOG_FILENAME_BASENAME: + ret = snprintf(buf + offset, rem, "%s:%d ", const_basename(file), line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + } } } ret = vsnprintf(buf + offset, rem, format, ap); @@ -428,6 +431,31 @@ goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); + /* For LOG_FILENAME_POS_LAST, print the source file info only when the caller ended the log + * message in '\n'. If so, nip the last '\n' away, insert the source file info and re-append an + * '\n'. All this to allow LOGP("start..."); LOGPC("...end\n") constructs. */ + if (target->print_filename_pos == LOG_FILENAME_POS_LINE_END + && offset > 0 && buf[offset-1] == '\n') { + switch (target->print_filename2) { + case LOG_FILENAME_NONE: + break; + case LOG_FILENAME_PATH: + offset --; + ret = snprintf(buf + offset, rem, " (%s:%d)\n", file, line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + case LOG_FILENAME_BASENAME: + offset --; + ret = snprintf(buf + offset, rem, " (%s:%d)\n", const_basename(file), line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + } + } + if (target->use_color) { ret = snprintf(buf + offset, rem, "\033[0;m"); if (ret < 0) @@ -677,6 +705,17 @@ target->print_filename2 = lft; } +/*! Set the position where on a log line the source file info should be logged. + * \param[in] target Log target to be affected. + * \param[in] pos A LOG_FILENAME_POS_* enum value. + * LOG_FILENAME_POS_DEFAULT logs just before the caller supplied log message. + * LOG_FILENAME_POS_LAST logs only at the end of a log line, where the caller issued an '\n' to end the + */ +void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos) +{ + target->print_filename_pos = pos; +} + /*! Enable or disable printing of the category name * \param[in] target Log target to be affected * \param[in] print_catname Enable (1) or disable (0) filenames diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 1194914..8c8a332 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -246,12 +246,14 @@ DEFUN(logging_prnt_file, logging_prnt_file_cmd, - "logging print file (0|1|basename)", + "logging print file (0|1|basename) [last]", LOGGING_STR "Log output settings\n" "Configure log message\n" "Don't prefix each log message\n" "Prefix each log message with the source file and line\n" - "Prefix each log message with the source file's basename (strip leading paths) and line\n") + "Prefix each log message with the source file's basename (strip leading paths) and line\n" + "Log source file info at the end of a log line. If omitted, log source file info just" + " before the log text.\n") { struct log_target *tgt = osmo_log_vty2tgt(vty); @@ -259,6 +261,10 @@ return CMD_WARNING; log_set_print_filename2(tgt, get_string_value(logging_print_file_args, argv[0])); + if (argc > 1) + log_set_print_filename_pos(tgt, LOG_FILENAME_POS_LINE_END); + else + log_set_print_filename_pos(tgt, LOG_FILENAME_POS_HEADER_END); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I393907b3c9e0cc1145e102328adad0a83ee13a9f Gerrit-Change-Number: 10631 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Aug 27 19:55:35 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 27 Aug 2018 19:55:35 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b845740d0e3_798110ae67c11915e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_8.0/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 68s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 68s] make -C firmware BOARD=simtrace APP=dfu [ 68s] make[2]: Entering directory '/usr/src/packages/BUILD/firmware' [ 68s] gcc usbstring/usbstring.c -o usbstring/usbstring [ 68s] cat apps/dfu/usb_strings.txt | usbstring/usbstring > apps/dfu/usb_strings_generated.h [ 68s] mkdir -p bin [ 68s] mkdir -p obj/simtrace [ 68s] [COMPILING libosmocore/source/panic.c] [ 68s] arm-none-eabi-gcc: error: unrecognized command line option '-fstack-protector-strong' [ 68s] Makefile:224: recipe for target 'obj/simtrace/flash_panic.o' failed [ 68s] make[2]: *** [obj/simtrace/flash_panic.o] Error 1 [ 68s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 68s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 68s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 68s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 68s] dh_auto_build: make -j1 returned exit code 2 [ 68s] debian/rules:4: recipe for target 'build' failed [ 68s] make: *** [build] Error 2 [ 68s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 68s] [ 68s] lamb23 failed "build simtrace2_0.5.1.dsc" at Mon Aug 27 19:55:24 UTC 2018. [ 68s] [ 68s] ### VM INTERACTION START ### [ 69s] Powering off. [ 69s] [ 57.825690] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] lamb23 failed "build simtrace2_0.5.1.dsc" at Mon Aug 27 19:55:25 UTC 2018. [ 69s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Aug 27 19:56:09 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 27 Aug 2018 19:56:09 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b84575cc4d5d_798110ae67c1191945@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_8.0/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 65s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 65s] make -C firmware BOARD=simtrace APP=dfu [ 65s] make[2]: Entering directory '/usr/src/packages/BUILD/firmware' [ 65s] gcc usbstring/usbstring.c -o usbstring/usbstring [ 65s] cat apps/dfu/usb_strings.txt | usbstring/usbstring > apps/dfu/usb_strings_generated.h [ 65s] mkdir -p bin [ 65s] mkdir -p obj/simtrace [ 65s] [COMPILING libosmocore/source/panic.c] [ 65s] arm-none-eabi-gcc: error: unrecognized command line option '-fstack-protector-strong' [ 65s] Makefile:224: recipe for target 'obj/simtrace/flash_panic.o' failed [ 65s] make[2]: *** [obj/simtrace/flash_panic.o] Error 1 [ 65s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 65s] Makefile:10: recipe for target 'fw-simtrace-dfu' failed [ 65s] make[1]: *** [fw-simtrace-dfu] Error 2 [ 65s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 65s] dh_auto_build: make -j1 returned exit code 2 [ 65s] debian/rules:4: recipe for target 'build' failed [ 65s] make: *** [build] Error 2 [ 65s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 65s] [ 65s] lamb26 failed "build simtrace2_0.5.1.dsc" at Mon Aug 27 19:55:54 UTC 2018. [ 65s] [ 65s] ### VM INTERACTION START ### [ 66s] Powering off. [ 66s] [ 55.540483] reboot: Power down [ 66s] ### VM INTERACTION END ### [ 66s] [ 66s] lamb26 failed "build simtrace2_0.5.1.dsc" at Mon Aug 27 19:55:55 UTC 2018. [ 66s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:01 +0000 Subject: Change in osmo-bsc[master]: cosmetic: neighbor_ident_vty.c: add and use common string defs Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10632 Change subject: cosmetic: neighbor_ident_vty.c: add and use common string defs ...................................................................... cosmetic: neighbor_ident_vty.c: add and use common string defs The "bts", "lac" and "lac-ci" VTY parameters and documentation are used more than once in this file. Define once and re-use. Prepares cosmetically for a fix of the CI format in upcoming Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f. Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff --- M src/osmo-bsc/neighbor_ident_vty.c 1 file changed, 21 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/10632/1 diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index a38d123..993e0b4 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -74,6 +74,15 @@ #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add local or remote-BSS neighbor cell\n" #define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n" +#define LAC_PARAMS "lac <0-65535>" +#define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" + +#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>" +#define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" + +#define LOCAL_BTS_PARAMS "bts <0-255>" +#define LOCAL_BTS_DOC "Neighbor cell by local BTS number\n" "BTS number\n" + static struct gsm_bts *neighbor_ident_vty_parse_bts_nr(struct vty *vty, const char **argv) { const char *bts_nr_str = argv[0]; @@ -206,22 +215,22 @@ } DEFUN(cfg_neighbor_add_bts_nr, cfg_neighbor_add_bts_nr_cmd, - NEIGHBOR_ADD_CMD "bts <0-255>", - NEIGHBOR_ADD_DOC "Neighbor cell by local BTS number\n" "BTS number\n") + NEIGHBOR_ADD_CMD LOCAL_BTS_PARAMS, + NEIGHBOR_ADD_DOC LOCAL_BTS_DOC) { return add_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv)); } DEFUN(cfg_neighbor_add_lac, cfg_neighbor_add_lac_cmd, - NEIGHBOR_ADD_CMD "lac <0-65535>", - NEIGHBOR_ADD_DOC "Neighbor cell by LAC\n" "LAC\n") + NEIGHBOR_ADD_CMD LAC_PARAMS, + NEIGHBOR_ADD_DOC LAC_DOC) { return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac(vty, argv))); } DEFUN(cfg_neighbor_add_lac_ci, cfg_neighbor_add_lac_ci_cmd, - NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255>", - NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n") + NEIGHBOR_ADD_CMD LAC_CI_PARAMS, + NEIGHBOR_ADD_DOC LAC_CI_DOC) { return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv))); } @@ -344,8 +353,8 @@ } DEFUN(cfg_neighbor_add_lac_arfcn_bsic, cfg_neighbor_add_lac_arfcn_bsic_cmd, - NEIGHBOR_ADD_CMD "lac <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, - NEIGHBOR_ADD_DOC "Neighbor cell by lac\n" "lac\n" NEIGHBOR_IDENT_VTY_KEY_DOC) + NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_DOC LAC_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac(vty, argv); @@ -357,8 +366,8 @@ } DEFUN(cfg_neighbor_add_lac_ci_arfcn_bsic, cfg_neighbor_add_lac_ci_arfcn_bsic_cmd, - NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, - NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC) + NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_DOC LAC_CI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac_ci(vty, argv); @@ -383,8 +392,8 @@ } DEFUN(cfg_neighbor_del_bts_nr, cfg_neighbor_del_bts_nr_cmd, - NEIGHBOR_DEL_CMD "bts <0-255>", - NEIGHBOR_DEL_DOC "Neighbor cell by local BTS number\n" "BTS number\n") + NEIGHBOR_DEL_CMD LOCAL_BTS_PARAMS, + NEIGHBOR_DEL_DOC LOCAL_BTS_DOC) { return del_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv)); } -- To view, visit https://gerrit.osmocom.org/10632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff Gerrit-Change-Number: 10632 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:01 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident_vty.c: fix CI format, should be 16bit Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10633 Change subject: neighbor_ident_vty.c: fix CI format, should be 16bit ...................................................................... neighbor_ident_vty.c: fix CI format, should be 16bit Use 65535 as CI in the neighbor_ident.vty verify the range. Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/10633/1 diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 993e0b4..28f4afd 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -77,7 +77,7 @@ #define LAC_PARAMS "lac <0-65535>" #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" -#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>" +#define LAC_CI_PARAMS "lac-ci <0-65535> <0-65535>" #define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" #define LOCAL_BTS_PARAMS "bts <0-255>" @@ -379,7 +379,7 @@ } DEFUN(cfg_neighbor_add_cgi_arfcn_bsic, cfg_neighbor_add_cgi_arfcn_bsic_cmd, - NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, NEIGHBOR_ADD_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 692d894..5b9c8ca 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -38,7 +38,7 @@ OsmoBSC(config-net-bts)# type sysmobts OsmoBSC(config-net-bts)# base_station_id_code 12 OsmoBSC(config-net-bts)# location_area_code 22 -OsmoBSC(config-net-bts)# cell_identity 32 +OsmoBSC(config-net-bts)# cell_identity 65535 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 42 OsmoBSC(config-net-bts-trx)# exit @@ -82,9 +82,9 @@ ... neighbor add bts <0-255> neighbor add lac <0-65535> - neighbor add lac-ci <0-65535> <0-255> + neighbor add lac-ci <0-65535> <0-65535> neighbor add lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) - neighbor add lac-ci <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any) + neighbor add lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor add cgi <0-999> <0-999> <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any) neighbor del bts <0-255> neighbor del arfcn <0-1023> bsic (<0-63>|any) @@ -148,7 +148,7 @@ bts 0 ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add cgi 023 42 423 5 arfcn 23 bsic 42 neighbor add cgi 023 042 423 6 arfcn 23 bsic 42 neighbor add cgi 023 042 234 56 arfcn 23 bsic 42 @@ -179,7 +179,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac 456 arfcn 123 bsic 45 neighbor add lac-ci 789 10 arfcn 423 bsic any neighbor add lac-ci 789 10 arfcn 423 bsic 63 @@ -192,7 +192,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac-ci 789 10 arfcn 423 bsic any neighbor add lac-ci 789 10 arfcn 423 bsic 63 neighbor add lac-ci 789 10 arfcn 423 bsic 1 @@ -204,7 +204,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac-ci 789 10 arfcn 423 bsic 63 neighbor add lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor add @@ -215,7 +215,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor add @@ -225,7 +225,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 ... !neighbor add OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any @@ -233,7 +233,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 ... !neighbor add OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any @@ -241,7 +241,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 ... !neighbor add OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12 -- To view, visit https://gerrit.osmocom.org/10633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f Gerrit-Change-Number: 10633 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:02 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: continue despite missing Classmark Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10634 Change subject: inter-BSC HO incoming: continue despite missing Classmark ...................................................................... inter-BSC HO incoming: continue despite missing Classmark 3GPP mandates either Classmark Information 1 or 2 in BSSMAP Handover Request, but an SCCPlite MSC currently tested does not pass either of them. Make this missing IE a non-fatal error, continuing anyway should work out. Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/10634/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index c2f5c8b..e3e8ae1 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -424,10 +424,10 @@ } memcpy(&req->classmark.classmark2, e->val, len); req->classmark.classmark2_len = len; - } else { - LOG_HO(conn, LOGL_ERROR, "Missing IE: either Classmark Information 1 or 2 required\n"); - return false; - } + } else + LOG_HO(conn, LOGL_INFO, + "Missing mandatory IE: 3GPP mandates either Classmark Information 1 or 2" + " in BSSMAP Handover Request, but neither are present. Will continue without.\n"); if (TLVP_PRESENT(tp, GSM0808_IE_AOIP_TRASP_ADDR)) { int rc; -- To view, visit https://gerrit.osmocom.org/10634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 Gerrit-Change-Number: 10634 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:02 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: drop old/wrong RTP port code Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10635 Change subject: inter-BSC HO incoming: drop old/wrong RTP port code ...................................................................... inter-BSC HO incoming: drop old/wrong RTP port code Drop nonsensical legacy code. The Circuit Identifier Code in A/SCCPlite does *not* indicate the RTP port to use. Rather, it indicates the MGW endpoint name to use when configuring the BSC's side of the MGW endpoint, and only the MGW will ever know the RTP port. Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed --- M src/osmo-bsc/handover_fsm.c 1 file changed, 0 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/35/10635/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index e3e8ae1..a42f10c 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -487,25 +487,8 @@ OSMO_STRLCPY_ARRAY(req->cell_id_target_name, gsm0808_cell_id_name(&req->cell_id_target)); if ((e = TLVP_GET(tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE))) { - int timeslot; - int multiplex; - /* CIC is permitted in both AoIP and SCCPlite */ req->msc_assigned_cic = osmo_load16be(e->val); - - /* For SCCPlite, the CIC implies the RTP port to use */ - if (sccplite) { - timeslot = req->msc_assigned_cic & 0x1f; - multiplex = (req->msc_assigned_cic & ~0x1f) >> 5; - req->msc_assigned_rtp_port = mgcp_timeslot_to_port(multiplex, timeslot, - conn->sccp.msc->rtp_base); - LOG_HO(conn, LOGL_DEBUG, "Derived RTP port from MSC assigned CIC:" - " CIC=0x%x (timeslot=%d multiplex=%d) rtp_base=%d=0x%x RTP-port=%u\n", - req->msc_assigned_cic, timeslot, multiplex, - conn->sccp.msc->rtp_base, conn->sccp.msc->rtp_base, - req->msc_assigned_rtp_port); - } - } else if (sccplite) { /* no CIC but SCCPlite: illegal */ LOG_HO(conn, LOGL_ERROR, "SCCPlite MSC, but no CIC in incoming inter-BSC Handover\n"); -- To view, visit https://gerrit.osmocom.org/10635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed Gerrit-Change-Number: 10635 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:03 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: lchan_fail_to(): store target state early Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10636 Change subject: lchan_fsm: lchan_fail_to(): store target state early ...................................................................... lchan_fsm: lchan_fail_to(): store target state early lchan_fail_to() is a macro to preserve useful source file:line information in logging. But a side effect is that its target state argument might evaluate differently at the end of the macro, if, say, the fi->state has changed. I hit such an instance on timeout of WAIT_RLL_RTP_ESTABLISH: lchan_fsm_timer_cb() calls macro lchan_fail(), which calls lchan_fail_to(lchan_fsm_on_error[fi->state]). Unlike for normal function invocation, this argument changes as fi->state changes. Since releasing the lchan_rtp_fsm already transitions the lchan fi into WAIT_RF_RELEASE_ACK, the final state change of lchan_fail_to() suddenly evaluates to the broken state instead of the intended WAIT_RF_RELEASE_ACK. Early in lchan_fail_to(), store the argument's value as of macro invocation. Change-Id: Id9bf4580a112ee5629f553a8bcb6b5b03b1c5f53 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/10636/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9c22bde..e0015cb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -211,9 +211,11 @@ /* Set a failure message, trigger the common actions to take on failure, transition to a state to * continue with (using state timeouts from lchan_fsm_timeouts[]). Assumes local variable fi exists. */ -#define lchan_fail_to(state_chg, fmt, args...) do { \ +#define lchan_fail_to(STATE_CHG, fmt, args...) do { \ struct gsm_lchan *_lchan = fi->priv; \ uint32_t state_was = fi->state; \ + /* Snapshot the target state, in case the macro argument evaluates differently later */ \ + const uint32_t state_chg = STATE_CHG; \ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ osmo_fsm_state_name(fi->fsm, state_was), ## args); \ -- To view, visit https://gerrit.osmocom.org/10636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id9bf4580a112ee5629f553a8bcb6b5b03b1c5f53 Gerrit-Change-Number: 10636 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:03 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan_fsm failure: log about state transitions Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10637 Change subject: cosmetic: lchan_fsm failure: log about state transitions ...................................................................... cosmetic: lchan_fsm failure: log about state transitions Early on during failure, log which state transition is intended after failure handling. If such state is already reached after failure handling, do not log "state transition not permitted", but rather skip the state change and log "Already in state X". Change-Id: I81f53b38637823e62860cb773b7573bb5c21fdb0 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/10637/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e0015cb..e856fd0 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -213,16 +213,23 @@ * continue with (using state timeouts from lchan_fsm_timeouts[]). Assumes local variable fi exists. */ #define lchan_fail_to(STATE_CHG, fmt, args...) do { \ struct gsm_lchan *_lchan = fi->priv; \ + struct osmo_fsm *fsm = fi->fsm; \ uint32_t state_was = fi->state; \ /* Snapshot the target state, in case the macro argument evaluates differently later */ \ const uint32_t state_chg = STATE_CHG; \ + LOG_LCHAN(_lchan, LOGL_DEBUG, "Handling failure, will then transition to state %s\n", \ + osmo_fsm_state_name(fsm, state_chg)); \ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ - osmo_fsm_state_name(fi->fsm, state_was), ## args); \ + osmo_fsm_state_name(fsm, state_was), ## args); \ if (!_lchan->activate.concluded) \ lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ _lchan->activate.concluded = true; \ - lchan_fsm_state_chg(state_chg); \ + if (fi->state != state_chg) \ + lchan_fsm_state_chg(state_chg); \ + else \ + LOG_LCHAN(_lchan, LOGL_DEBUG, "After failure handling, already in state %s\n", \ + osmo_fsm_state_name(fsm, state_chg)); \ } while(0) /* Which state to transition to when lchan_fail() is called in a given state. */ -- To view, visit https://gerrit.osmocom.org/10637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I81f53b38637823e62860cb773b7573bb5c21fdb0 Gerrit-Change-Number: 10637 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:03 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: safer 'concluded' flag Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10638 Change subject: lchan_fsm: safer 'concluded' flag ...................................................................... lchan_fsm: safer 'concluded' flag The flag lchan->activate.concluded prevents entering the lchan_on_fully_established()/lchan_on_activation_failure() more than once. So far it was checked by callers, instead place in the functions themselves. There is a potential functional change here, since during lchan_fail(), the concluded flag was set only after entering lchan_on_activation_failure(). Now it is already set at the start and prevents multiple re-entry beyond doubt. This patch is not a result of an actual observed faulty behavior, just from reading the code and seeing the slight loophole. Change-Id: I0c906438b05442d66255203eb816453b7193a6d8 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/10638/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index b827d0a..d6e8954 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -505,7 +505,10 @@ struct { enum lchan_activate_mode activ_for; bool activ_ack; /*< true as soon as RSL Chan Activ Ack is received */ - bool concluded; /*< true as soon as LCHAN_ST_ESTABLISHED is reached */ + /*! This flag ensures that when an lchan activation has succeeded, and we have already + * sent ACKs like Immediate Assignment or BSSMAP Assignment Complete, and if other errors + * occur later, e.g. during release, that we don't send a NACK out of context. */ + bool concluded; bool requires_voice_stream; bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ uint16_t msc_assigned_cic; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e856fd0..13ae7ad 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -88,6 +88,10 @@ struct gsm_subscriber_connection *for_conn, const char *file, int line) { + if (lchan->activate.concluded) + return; + lchan->activate.concluded = true; + switch (activ_for) { case FOR_MS_CHANNEL_REQUEST: @@ -135,6 +139,10 @@ static void lchan_on_fully_established(struct gsm_lchan *lchan) { + if (lchan->activate.concluded) + return; + lchan->activate.concluded = true; + switch (lchan->activate.activ_for) { case FOR_MS_CHANNEL_REQUEST: /* No signalling to do here, MS is free to use the channel, and should go on to connect @@ -222,9 +230,7 @@ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ osmo_fsm_state_name(fsm, state_was), ## args); \ - if (!_lchan->activate.concluded) \ - lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ - _lchan->activate.concluded = true; \ + lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ if (fi->state != state_chg) \ lchan_fsm_state_chg(state_chg); \ else \ @@ -751,10 +757,6 @@ return; } - /* This flag ensures that when an lchan activation has succeeded, and we have already sent ACKs - * like Immediate Assignment or BSSMAP Assignment Complete, and if then, way later, some other - * error occurs, e.g. during release, that we don't send a NACK out of context. */ - lchan->activate.concluded = true; lchan_on_fully_established(lchan); } -- To view, visit https://gerrit.osmocom.org/10638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0c906438b05442d66255203eb816453b7193a6d8 Gerrit-Change-Number: 10638 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:04 +0000 Subject: Change in osmo-bsc[master]: log: lchan_rtp_fsm: add missing '\n' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10639 Change subject: log: lchan_rtp_fsm: add missing '\n' ...................................................................... log: lchan_rtp_fsm: add missing '\n' Change-Id: Ifa46295ef23cf3728bc946fe27b34f0607a24c9e --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/10639/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 93883af..bf73429 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -141,7 +141,7 @@ struct mgcp_conn_peer crcx_info = {}; if (use_mgwep_ci) { - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint already available: %s", + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint already available: %s\n", mgwep_ci_name(use_mgwep_ci)); lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY); return; @@ -174,7 +174,7 @@ switch (event) { case LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE: - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint: %s", + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint: %s\n", mgwep_ci_name(lchan_use_mgw_endpoint_ci_bts(lchan))); lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY); return; @@ -205,7 +205,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); if (lchan->activate.activ_ack) { - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Activ Ack received earlier, no need to wait"); + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Activ Ack received earlier, no need to wait\n"); lchan_rtp_fsm_post_lchan_ready(fi); } } @@ -426,7 +426,7 @@ return; } - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Sending BTS side RTP port info %s:%u to MGW %s", + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Sending BTS side RTP port info %s:%u to MGW %s\n", mdcx_info.addr, mdcx_info.port, mgwep_ci_name(ci)); mgw_endpoint_ci_request(ci, MGCP_VERB_MDCX, &mdcx_info, fi, LCHAN_RTP_EV_MGW_ENDPOINT_CONFIGURED, -- To view, visit https://gerrit.osmocom.org/10639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa46295ef23cf3728bc946fe27b34f0607a24c9e Gerrit-Change-Number: 10639 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:04 +0000 Subject: Change in osmo-bsc[master]: log: 'sending BSSMAP HO Request ACK' Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10640 Change subject: log: 'sending BSSMAP HO Request ACK' ...................................................................... log: 'sending BSSMAP HO Request ACK' Change-Id: Ie472c32861d9c9ca9ebec0221837030ffd83c73a --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/10640/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index c067dd3..560bddc 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1041,6 +1041,7 @@ struct msgb *msg; struct gsm_lchan *new_lchan = conn->ho.new_lchan; + LOG_HO(conn, LOGL_DEBUG, "Sending BSSMAP Handover Request Acknowledge\n"); msg = gsm0808_create_handover_request_ack(rr_ho_command->data, rr_ho_command->len, gsm0808_chosen_channel(new_lchan->type, new_lchan->tch_mode), -- To view, visit https://gerrit.osmocom.org/10640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie472c32861d9c9ca9ebec0221837030ffd83c73a Gerrit-Change-Number: 10640 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:04 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO: send failure msg directly Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10641 Change subject: inter-BSC HO: send failure msg directly ...................................................................... inter-BSC HO: send failure msg directly If inter-BSC HO failed, the conn is by definition not in an active state, and hence it makes no sense to verify the gscon FSM state before sending. Directly call osmo_bsc_sigtran_send(). Change-Id: Ic49c94462041800674fa961c4d19c0c045bfe0c0 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/10641/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 560bddc..03e073a 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1121,7 +1121,7 @@ return; } - rc = gscon_sigtran_send(conn, msg); + rc = osmo_bsc_sigtran_send(conn, msg); if (rc) LOG_HO(conn, LOGL_ERROR, "Cannot send BSSMAP Handover Failure message (rc=%d %s)\n", rc, strerror(-rc)); -- To view, visit https://gerrit.osmocom.org/10641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic49c94462041800674fa961c4d19c0c045bfe0c0 Gerrit-Change-Number: 10641 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:05:04 +0000 Subject: Change in osmo-bsc[master]: log: tweaks and more context in osmo_bsc_sigtran_send() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10642 Change subject: log: tweaks and more context in osmo_bsc_sigtran_send() ...................................................................... log: tweaks and more context in osmo_bsc_sigtran_send() Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/10642/1 diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 96f0687..f39bb92 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -363,16 +363,18 @@ if (msg->len >= 3) { switch (msg->data[0]) { case BSSAP_MSG_BSS_MANAGEMENT: - LOGP(DMSC, LOGL_INFO, "Tx MSC %s\n", gsm0808_bssmap_name(msg->data[2])); + LOGP(DMSC, LOGL_INFO, "Tx MSC: BSS Management: %s\n", + gsm0808_bssmap_name(msg->data[2])); break; case BSSAP_MSG_DTAP: - LOGP(DMSC, LOGL_INFO, "Tx MSC DTAP\n"); + LOGP(DMSC, LOGL_INFO, "Tx MSC: DTAP\n"); break; default: - LOGP(DMSC, LOGL_ERROR, "Tx MSC (unknwon message type)\n"); + LOGP(DMSC, LOGL_ERROR, "Tx MSC: unknown message type: 0x%x\n", + msg->data[0]); } } else - LOGP(DMSC, LOGL_ERROR, "Tx MSC (message too short)\n"); + LOGP(DMSC, LOGL_ERROR, "Tx MSC: message too short: %u\n", msg->len); if (a_reset_conn_ready(msc) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); -- To view, visit https://gerrit.osmocom.org/10642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b Gerrit-Change-Number: 10642 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Aug 27 23:08:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 27 Aug 2018 23:08:55 +0000 Subject: Change in libosmocore[master]: gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10643 Change subject: gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 ...................................................................... gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 Change-Id: I9e128ba775227de5e4010f024338a78584f777ea --- M src/gsm/gsm0808.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/10643/1 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index a90aa22..8c2d143 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -763,6 +763,9 @@ if (chosen_speech_version != 0) msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, chosen_speech_version); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } @@ -780,6 +783,9 @@ /* Message Type, 3.2.2.1 */ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_DETECT); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } @@ -816,6 +822,9 @@ if (params->lcls_bss_status_present) msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, params->lcls_bss_status); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } @@ -843,6 +852,9 @@ if (params->codec_list_bss_supported.len) gsm0808_enc_speech_codec_list(msg, ¶ms->codec_list_bss_supported); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } -- To view, visit https://gerrit.osmocom.org/10643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9e128ba775227de5e4010f024338a78584f777ea Gerrit-Change-Number: 10643 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 09:13:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 09:13:04 +0000 Subject: Change in osmo-mgw[master]: X-Osmo-IGN: rather parse items by token, not char In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10619 to look at the new patch set (#2). Change subject: X-Osmo-IGN: rather parse items by token, not char ...................................................................... X-Osmo-IGN: rather parse items by token, not char Adjust the X-Osmo-IGN parsing to use string tokens instead of parsing single characters. Reconsidering the first implementation as a poor choice, rather specify the format of X-Osmo-IGN as any-length string tokens separated by spaces, which is more flexible and more future proof. See also osmo-gsm-manuals If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 which defines the X-Osmo-IGN format as string tokens, matching this patch. In mgcp_test, add an unknown X-Osmo-IGN item. Though the output is not checked by the testsuite.at, running manually shows the error log about the unkown X-Osmo-IGN item. Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c --- M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 28 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/10619/2 -- To view, visit https://gerrit.osmocom.org/10619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c Gerrit-Change-Number: 10619 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 09:14:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 09:14:57 +0000 Subject: Change in osmo-mgw[master]: X-Osmo-IGN: rather parse items by token, not char In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10619 to look at the new patch set (#3). Change subject: X-Osmo-IGN: rather parse items by token, not char ...................................................................... X-Osmo-IGN: rather parse items by token, not char Adjust the X-Osmo-IGN parsing to use string tokens instead of parsing single characters. Reconsidering the first implementation as a poor choice, rather specify the format of X-Osmo-IGN as any-length string tokens separated by spaces, which is more flexible and more future proof. See also osmo-gsm-manuals If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 which defines the X-Osmo-IGN format as string tokens, matching this patch. In mgcp_test, add an unknown X-Osmo-IGN item. Though the output is not checked by the testsuite.at, running manually shows the error log about the unkown X-Osmo-IGN item. Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c --- M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 28 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/10619/3 -- To view, visit https://gerrit.osmocom.org/10619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c Gerrit-Change-Number: 10619 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 09:26:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 09:26:21 +0000 Subject: Change in osmo-bts[master]: fix ip.access dyn TS for osmo-bts-trx In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10598 ) Change subject: fix ip.access dyn TS for osmo-bts-trx ...................................................................... Patch Set 2: Verified+1 Code-Review+1 Sorry I didn't see your answer before. For me it's fine merging this patch as it is, but if you think there's still a better way of implementing this, it may then be a good idea to create a task so we can improve it later on. -- To view, visit https://gerrit.osmocom.org/10598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d Gerrit-Change-Number: 10598 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 28 Aug 2018 09:26:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 09:51:04 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 28 Aug 2018 09:51:04 +0000 Subject: Change in osmo-gsm-tester[master]: Check for the sispm dependency Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10644 Change subject: Check for the sispm dependency ...................................................................... Check for the sispm dependency >From the commit that added it: Using it requires the following extra dependencies: $ apt-get install python3-usb $ pip3 install pysispm Change-Id: Id347604f47ac5243b7eae12b9bdf675f2379f4c6 --- M check_dependencies.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/44/10644/1 diff --git a/check_dependencies.py b/check_dependencies.py index d9b857c..ff78fe3 100755 --- a/check_dependencies.py +++ b/check_dependencies.py @@ -24,5 +24,6 @@ import yaml import pydbus import sqlite3 +import sispm print('dependencies ok') -- To view, visit https://gerrit.osmocom.org/10644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id347604f47ac5243b7eae12b9bdf675f2379f4c6 Gerrit-Change-Number: 10644 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 09:53:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 09:53:34 +0000 Subject: Change in osmo-gsm-tester[master]: Check for the sispm dependency In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10644 ) Change subject: Check for the sispm dependency ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id347604f47ac5243b7eae12b9bdf675f2379f4c6 Gerrit-Change-Number: 10644 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 09:53:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 09:53:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 09:53:51 +0000 Subject: Change in osmo-bsc[master]: fix unaligned access in abis_nm_rx_ipacc() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10645 Change subject: fix unaligned access in abis_nm_rx_ipacc() ...................................................................... fix unaligned access in abis_nm_rx_ipacc() Related: OS#3496 Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/10645/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 4757c72..93ca33a 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -2661,10 +2662,11 @@ DEBUGPC(DNM, "IP=%s ", inet_ntoa(addr)); } - if (TLVP_PRESENT(&tp, NM_ATT_IPACC_DST_IP_PORT)) - DEBUGPC(DNM, "PORT=%u ", - ntohs(*((uint16_t *) - TLVP_VAL(&tp, NM_ATT_IPACC_DST_IP_PORT)))); + if (TLVP_PRESENT(&tp, NM_ATT_IPACC_DST_IP_PORT)) { + uint16_t port; + memcpy(&port, TLVP_VAL(&tp, NM_ATT_IPACC_DST_IP_PORT), sizeof(port)); + DEBUGPC(DNM, "PORT=%" SCNu16 " ", ntohs(port)); + } if (TLVP_PRESENT(&tp, NM_ATT_IPACC_STREAM_ID)) DEBUGPC(DNM, "STREAM=0x%02x ", *TLVP_VAL(&tp, NM_ATT_IPACC_STREAM_ID)); -- To view, visit https://gerrit.osmocom.org/10645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 Gerrit-Change-Number: 10645 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 10:48:53 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 28 Aug 2018 10:48:53 +0000 Subject: Change in osmo-gsm-tester[master]: Check for the sispm dependency In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10644 ) Change subject: Check for the sispm dependency ...................................................................... Check for the sispm dependency >From the commit that added it: Using it requires the following extra dependencies: $ apt-get install python3-usb $ pip3 install pysispm Change-Id: Id347604f47ac5243b7eae12b9bdf675f2379f4c6 --- M check_dependencies.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/check_dependencies.py b/check_dependencies.py index d9b857c..ff78fe3 100755 --- a/check_dependencies.py +++ b/check_dependencies.py @@ -24,5 +24,6 @@ import yaml import pydbus import sqlite3 +import sispm print('dependencies ok') -- To view, visit https://gerrit.osmocom.org/10644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id347604f47ac5243b7eae12b9bdf675f2379f4c6 Gerrit-Change-Number: 10644 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 10:54:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 10:54:38 +0000 Subject: Change in libosmocore[master]: log: add 'last' option to 'logging print file' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10631 ) Change subject: log: add 'last' option to 'logging print file' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I393907b3c9e0cc1145e102328adad0a83ee13a9f Gerrit-Change-Number: 10631 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 10:54:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 10:56:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 10:56:29 +0000 Subject: Change in osmo-bsc[master]: fix unaligned access in abis_nm_rx_ipacc() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10645 ) Change subject: fix unaligned access in abis_nm_rx_ipacc() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10645/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/10645/1/src/osmo-bsc/abis_nm.c at 2667 PS1, Line 2667: memcpy(&port, TLVP_VAL(&tp, NM_ATT_IPACC_DST_IP_PORT), sizeof(port)); I think we've had this exact example in reviews during past weeks several times now. We do have osmo_load16be() for this purpose. Thanks :) -- To view, visit https://gerrit.osmocom.org/10645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 Gerrit-Change-Number: 10645 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 10:56:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 10:58:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 10:58:08 +0000 Subject: Change in osmo-bts[master]: fix ip.access dyn TS for osmo-bts-trx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10598 ) Change subject: fix ip.access dyn TS for osmo-bts-trx ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d Gerrit-Change-Number: 10598 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 28 Aug 2018 10:58:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 10:59:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 10:59:03 +0000 Subject: Change in osmo-mgw[master]: X-Osmo-IGN: rather parse items by token, not char In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10619 ) Change subject: X-Osmo-IGN: rather parse items by token, not char ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c Gerrit-Change-Number: 10619 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 10:59:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 10:59:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 10:59:39 +0000 Subject: Change in libosmocore[master]: gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10643 ) Change subject: gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e128ba775227de5e4010f024338a78584f777ea Gerrit-Change-Number: 10643 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 10:59:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 10:59:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 10:59:59 +0000 Subject: Change in docker-playground[master]: BSC_sccplite: Different network names for BSC AoIP/sccplite tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10630 ) Change subject: BSC_sccplite: Different network names for BSC AoIP/sccplite tests ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9124340817888c02574735ab1b1c6c2df3e93212 Gerrit-Change-Number: 10630 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 28 Aug 2018 10:59:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:00:00 +0000 Subject: Change in docker-playground[master]: BSC_sccplite: Different network names for BSC AoIP/sccplite tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10630 ) Change subject: BSC_sccplite: Different network names for BSC AoIP/sccplite tests ...................................................................... BSC_sccplite: Different network names for BSC AoIP/sccplite tests Change-Id: I9124340817888c02574735ab1b1c6c2df3e93212 --- M ttcn3-bsc-test/jenkins-sccplite.sh 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index a0e9e0c..bceb0ec 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -2,6 +2,9 @@ . ../jenkins-common.sh +#Make sure NET_NAME doesn't clash with the AoIP BSC test +NET_NAME=ttcn3-bsc_sccplite-test + mkdir $VOL_BASE_DIR/bsc-tester cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -- To view, visit https://gerrit.osmocom.org/10630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9124340817888c02574735ab1b1c6c2df3e93212 Gerrit-Change-Number: 10630 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:00:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:00:21 +0000 Subject: Change in osmo-bsc[master]: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10586 ) Change subject: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe Gerrit-Change-Number: 10586 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 28 Aug 2018 11:00:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:00:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:00:48 +0000 Subject: Change in osmo-bsc[master]: cosmetic: neighbor_ident_vty.c: add and use common string defs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10632 ) Change subject: cosmetic: neighbor_ident_vty.c: add and use common string defs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff Gerrit-Change-Number: 10632 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:00:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:02:11 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident_vty.c: fix CI format, should be 16bit In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10633 ) Change subject: neighbor_ident_vty.c: fix CI format, should be 16bit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f Gerrit-Change-Number: 10633 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:02:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:03:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:03:21 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: continue despite missing Classmark In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10634 ) Change subject: inter-BSC HO incoming: continue despite missing Classmark ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10634/1/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/10634/1/src/osmo-bsc/handover_fsm.c at 428 PS1, Line 428: LOG_HO(conn, LOGL_INFO, I strongly suggest to ask the customer to report this bug to the MSC vendor. Please inclue a specific reference to the spec clause that requires this IE. -- To view, visit https://gerrit.osmocom.org/10634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 Gerrit-Change-Number: 10634 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:03:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:03:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:03:48 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: drop old/wrong RTP port code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10635 ) Change subject: inter-BSC HO incoming: drop old/wrong RTP port code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed Gerrit-Change-Number: 10635 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:03:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:04:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:04:32 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: lchan_fail_to(): store target state early In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10636 ) Change subject: lchan_fsm: lchan_fail_to(): store target state early ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id9bf4580a112ee5629f553a8bcb6b5b03b1c5f53 Gerrit-Change-Number: 10636 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:04:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:05:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:05:00 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan_fsm failure: log about state transitions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10637 ) Change subject: cosmetic: lchan_fsm failure: log about state transitions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I81f53b38637823e62860cb773b7573bb5c21fdb0 Gerrit-Change-Number: 10637 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:05:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:05:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:05:42 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: safer 'concluded' flag In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10638 ) Change subject: lchan_fsm: safer 'concluded' flag ...................................................................... Patch Set 1: Code-Review+2 i really like that kind of a change which makes APIs more robust -- To view, visit https://gerrit.osmocom.org/10638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c906438b05442d66255203eb816453b7193a6d8 Gerrit-Change-Number: 10638 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:05:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:05:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 11:05:58 +0000 Subject: Change in osmo-bsc[master]: log: lchan_rtp_fsm: add missing '\n' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10639 ) Change subject: log: lchan_rtp_fsm: add missing '\n' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa46295ef23cf3728bc946fe27b34f0607a24c9e Gerrit-Change-Number: 10639 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 11:05:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:10:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 11:10:49 +0000 Subject: Change in osmo-bsc[master]: fix unaligned access in abis_nm_rx_ipacc() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10645 to look at the new patch set (#2). Change subject: fix unaligned access in abis_nm_rx_ipacc() ...................................................................... fix unaligned access in abis_nm_rx_ipacc() Related: OS#3496 Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/10645/2 -- To view, visit https://gerrit.osmocom.org/10645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 Gerrit-Change-Number: 10645 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:11:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 11:11:36 +0000 Subject: Change in osmo-bsc[master]: fix unaligned access in abis_nm_rx_ipacc() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10645 ) Change subject: fix unaligned access in abis_nm_rx_ipacc() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/10645/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/10645/1/src/osmo-bsc/abis_nm.c at 2667 PS1, Line 2667: if (TLVP_PRESENT(&tp, NM_ATT_IPACC_STREAM_ID)) > I think we've had this exact example in reviews during past weeks several times now. [?] Oh, indeed! Thanks for pointing this out. -- To view, visit https://gerrit.osmocom.org/10645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 Gerrit-Change-Number: 10645 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 28 Aug 2018 11:11:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:15:27 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 28 Aug 2018 11:15:27 +0000 Subject: Change in osmo-sip-connector[master]: Logging: in check_rtp_create() log the IP address in human readable d... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10490 to look at the new patch set (#3). Change subject: Logging: in check_rtp_create() log the IP address in human readable dotted quad format. ...................................................................... Logging: in check_rtp_create() log the IP address in human readable dotted quad format. Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 --- M src/mncc.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/90/10490/3 -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:17:11 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 28 Aug 2018 11:17:11 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log RTP IP in dotted quad format. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10490 to look at the new patch set (#4). Change subject: Logging: Log RTP IP in dotted quad format. ...................................................................... Logging: Log RTP IP in dotted quad format. in check_rtp_create() log the IP address in human readable dotted quad format. Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 --- M src/mncc.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/90/10490/4 -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:20:40 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 28 Aug 2018 11:20:40 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log RTP IP in dotted quad format. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10490 to look at the new patch set (#5). Change subject: Logging: Log RTP IP in dotted quad format. ...................................................................... Logging: Log RTP IP in dotted quad format. in check_rtp_create() log the IP address in human readable dotted quad format. Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 --- M src/mncc.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/90/10490/5 -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 11:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 28 Aug 2018 11:22:34 +0000 Subject: Change in osmo-sip-connector[master]: Use htonl, not ntohl before inet_ntoa() Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10646 Change subject: Use htonl, not ntohl before inet_ntoa() ...................................................................... Use htonl, not ntohl before inet_ntoa() Change-Id: I805864759c287ad4e1d74e5f6ee16bf2d6a1b01f --- M src/sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/46/10646/1 diff --git a/src/sdp.c b/src/sdp.c index 213e979..17eb577 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -165,7 +165,7 @@ char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other) { - struct in_addr net = { .s_addr = ntohl(other->ip) }; + struct in_addr net = { .s_addr = htonl(other->ip) }; char *fmtp_str = NULL, *sdp; leg->wanted_codec = app_media_name(other->payload_msg_type); -- To view, visit https://gerrit.osmocom.org/10646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I805864759c287ad4e1d74e5f6ee16bf2d6a1b01f Gerrit-Change-Number: 10646 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 12:22:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 12:22:48 +0000 Subject: Change in libosmo-abis[master]: Properly deal with sockaddr_un socket path length limitations. Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10647 Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Properly deal with sockaddr_un socket path length limitations. When parsing the configuration, reject a socket path which exceeds the maximum size supported by the operating system. In unixsocket_line_update() stop copying the line's socket path to a local buffer. The path will be copied again in osmo_sock_unix_init(). Both changes are portable; we don't assume any particular socket path length since the size differs between implementations of Unix, and we rely only on information from the generic sys/un.h header. Change-Id: I36344805a825f5d0e0c9d218d438d8fd985ed9ca Related: OS#2673 --- M src/e1_input_vty.c M src/input/unixsocket.c 2 files changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/47/10647/1 diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index 0e4575f..653c573 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -98,6 +99,14 @@ { struct e1inp_line *line; int e1_nr = atoi(argv[0]); + struct sockaddr_un sun; + + /* Don't exceed the maximum unix socket path length. See the unix(7) man page.*/ + if (strlen(argv[1]) > sizeof(sun.sun_path)) { + vty_out(vty, "%% Socket path length exceeds %zd bytes: '%s'%s", + sizeof(sun.sun_path), argv[1], VTY_NEWLINE); + return CMD_WARNING; + } line = e1inp_line_find(e1_nr); if (!line) { diff --git a/src/input/unixsocket.c b/src/input/unixsocket.c index c49928d..f06345e 100644 --- a/src/input/unixsocket.c +++ b/src/input/unixsocket.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -228,16 +229,11 @@ static int unixsocket_line_update(struct e1inp_line *line) { struct unixsocket_line *config; - char sock_path[PATH_MAX]; + char default_sock_path[sizeof(struct sockaddr_un) + 1]; /* see unix(7) man page */ + char *sock_path; int ret = 0; int i; - if (line->sock_path) - osmo_strlcpy(sock_path, line->sock_path, PATH_MAX); - else - sprintf(sock_path, "%s%d", UNIXSOCKET_SOCK_PATH_DEFAULT, - line->num); - LOGP(DLINP, LOGL_NOTICE, "line update (line=%p)\n", line); if (!line->driver_data) @@ -255,6 +251,12 @@ config->fd.cb = unixsocket_cb; /* Open unix domain socket */ + if (line->sock_path == NULL) { + snprintf(default_sock_path, sizeof(default_sock_path), "%s%d", + UNIXSOCKET_SOCK_PATH_DEFAULT, line->num); + sock_path = default_sock_path; + } else + sock_path = line->sock_path; ret = osmo_sock_unix_init(SOCK_SEQPACKET, 0, sock_path, OSMO_SOCK_F_CONNECT); if (ret < 0) { -- To view, visit https://gerrit.osmocom.org/10647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I36344805a825f5d0e0c9d218d438d8fd985ed9ca Gerrit-Change-Number: 10647 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 12:38:54 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 12:38:54 +0000 Subject: Change in libosmocore[master]: Properly deal with sockaddr_un socket path length limitations. Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10648 Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Properly deal with sockaddr_un socket path length limitations. In osmo_sock_unix_init(), add support for non-NUL-terminated unix socket paths and return an error if the supplied socket path exceeds the maximum socket path length supported by the operating system. Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016 Related: OS#2673 --- M src/socket.c 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/10648/1 diff --git a/src/socket.c b/src/socket.c index 7e7f6d9..6f56efb 100644 --- a/src/socket.c +++ b/src/socket.c @@ -605,22 +605,29 @@ struct sockaddr_un local; int sfd, rc, on = 1; unsigned int namelen; + const size_t socket_path_len = strlen(socket_path); if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) return -EINVAL; local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); + if (socket_path_len == sizeof(local.sun_path)) { + /* Handle corner-case where sun_path is not NUL-terminated. See the unix(7) man page. */ + memcpy(local.sun_path, socket_path, sizeof(local.sun_path)); + } else if (osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { + LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", + sizeof(local.sun_path), socket_path); + return -ENOSPC; + } #if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); + local.sun_len = socket_path_len; #endif #if defined(BSD44SOCKETS) || defined(SUN_LEN) namelen = SUN_LEN(&local); #else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); + namelen = socket_path_len + offsetof(struct sockaddr_un, sun_path); #endif sfd = socket(AF_UNIX, type, proto); -- To view, visit https://gerrit.osmocom.org/10648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016 Gerrit-Change-Number: 10648 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 12:59:11 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Aug 2018 12:59:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: don't re-use the same NS for all 3 BSSGP Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10649 Change subject: sgsn: don't re-use the same NS for all 3 BSSGP ...................................................................... sgsn: don't re-use the same NS for all 3 BSSGP Create for every BSSGP a new NS instance. Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09 --- M sgsn/SGSN_Tests.default M sgsn/SGSN_Tests.ttcn 2 files changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/10649/1 diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index 82682e2..e44e234 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -20,12 +20,6 @@ [MODULE_PARAMETERS] -SGSN_Tests.mp_nsconfig := { - local_udp_port := 21000, - remote_udp_port := 23000, - nsvci := 97, - nsei := 96 -} Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSGSN"; [MAIN_CONTROLLER] diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 715bdcc..82c37f2 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -44,13 +44,31 @@ integer mp_hlr_port := 4222; charstring mp_ggsn_ip := "127.0.0.2"; - NSConfiguration mp_nsconfig := { - local_udp_port := 23000, - local_ip := "127.0.0.1", - remote_udp_port := 21000, - remote_ip := "127.0.0.1", - nsvci := 0, - nsei := 2342 + NSConfigurations mp_nsconfig := { + { + local_udp_port := 21010, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1", + nsvci := 97, + nsei := 96 + }, + { + local_udp_port := 21011, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1", + nsvci := 98, + nsei := 97 + }, + { + local_udp_port := 21012, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1", + nsvci := 99, + nsei := 98 + } }; }; @@ -61,6 +79,7 @@ }; type record length(3) of GbInstance GbInstances; +type record length(3) of NSConfiguration NSConfigurations; type record length(3) of BssgpCellId BssgpCellIds; type component test_CT { @@ -135,7 +154,7 @@ /* connect lower end of NS emulation to NS codec port (on top of IPL4) */ map(gb.vc_NS:NSCP, system:NS_CODEC_PORT); - gb.vc_NS.start(NSStart(mp_nsconfig)); + gb.vc_NS.start(NSStart(mp_nsconfig[offset])); gb.vc_BSSGP.start(BssgpStart(gb.cfg)); } -- To view, visit https://gerrit.osmocom.org/10649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09 Gerrit-Change-Number: 10649 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:09:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 13:09:29 +0000 Subject: Change in libosmocore[master]: properly handle mandatory cli param of gsm0808_create_paging2 Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10650 Change subject: properly handle mandatory cli param of gsm0808_create_paging2 ...................................................................... properly handle mandatory cli param of gsm0808_create_paging2 The cell identifier list parameter is mandatory. Document it as such, and tweak code which treated it like an optional parameter. No functional change. The existing code already asserts that a non-NULL value is passed for this parameter. Change-Id: I3716f9d5b210e0a7e6f45c9fe3fc34024e5234ad Related: OS#3021 --- M src/gsm/gsm0808.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/10650/1 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index a90aa22..fec3d25 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -588,7 +588,7 @@ /*! Create BSSMAP PAGING message * \param[in] imsi Mandatory paged IMSI in string representation * \param[in] tmsi Optional paged TMSI - * \param[in] cil Cell Identity List (where to page) + * \param[in] cil Mandatory Cell Identity List (where to page) * \param[in] chan_needed Channel Type needed * \returns callee-allocated msgb with BSSMAP PAGING message */ struct msgb *gsm0808_create_paging2(const char *imsi, const uint32_t *tmsi, @@ -615,7 +615,7 @@ /* Message Type 3.2.2.1 */ msgb_v_put(msg, BSS_MAP_MSG_PAGING); - /* IMSI 3.2.2.6 */ + /* mandatory IMSI 3.2.2.6 */ mid_len = gsm48_generate_mid_from_imsi(mid_buf, imsi); msgb_tlv_put(msg, GSM0808_IE_IMSI, mid_len - 2, mid_buf + 2); @@ -626,9 +626,8 @@ (uint8_t *) & tmsi_sw); } - /* Cell Identifier List 3.2.2.27 */ - if (cil) - gsm0808_enc_cell_id_list2(msg, cil); + /* mandatory Cell Identifier List 3.2.2.27 */ + gsm0808_enc_cell_id_list2(msg, cil); /* Channel Needed 3.2.2.36 */ if (chan_needed) { -- To view, visit https://gerrit.osmocom.org/10650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3716f9d5b210e0a7e6f45c9fe3fc34024e5234ad Gerrit-Change-Number: 10650 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:17:12 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Aug 2018 13:17:12 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/10651 Change subject: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 ...................................................................... ttcn3-sgsn-tests: synchronize module parameters with ttcn3 The module parameters changes in ttcn3 I3448fe837eaa8efab65dccc32bacaaacd73a2f09 Change-Id: I64408b2095fb2aea24c0306673aa40279ea9f75f --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/10651/1 diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index 92ed77b..5ad5f7d 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -13,8 +13,18 @@ [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { - local_ip := "172.18.8.103", - remote_ip := "172.18.8.10" + { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + }, + { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + }, + { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + } } SGSN_Tests.mp_hlr_ip := "172.18.8.103" SGSN_Tests.mp_ggsn_ip := "172.18.8.103" -- To view, visit https://gerrit.osmocom.org/10651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I64408b2095fb2aea24c0306673aa40279ea9f75f Gerrit-Change-Number: 10651 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:17:35 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 13:17:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: don't re-use the same NS for all 3 BSSGP In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10649 ) Change subject: sgsn: don't re-use the same NS for all 3 BSSGP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09 Gerrit-Change-Number: 10649 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 28 Aug 2018 13:17:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:21:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 13:21:46 +0000 Subject: Change in osmo-sip-connector[master]: Use htonl, not ntohl before inet_ntoa() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10646 ) Change subject: Use htonl, not ntohl before inet_ntoa() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I805864759c287ad4e1d74e5f6ee16bf2d6a1b01f Gerrit-Change-Number: 10646 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 28 Aug 2018 13:21:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:23:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 13:23:49 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log RTP IP in dotted quad format. In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10490 ) Change subject: Logging: Log RTP IP in dotted quad format. ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 28 Aug 2018 13:23:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 13:24:58 +0000 Subject: Change in osmo-trx[master]: vty: Fix typo in gpsdo clock reference type In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10627 ) Change subject: vty: Fix typo in gpsdo clock reference type ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f553c2cec9689524728cacb15b7daaff8166925 Gerrit-Change-Number: 10627 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 28 Aug 2018 13:24:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:34:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 13:34:17 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10022 to look at the new patch set (#3). Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... add VTY commands which show specific mgcp endpoints Add VTY commands "show mgcp endpoint NAME" and "show mgcp trunk <0-64> endpoint NAME" which show information about specific endpoints. Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Related: OS#2660 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 106 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/22/10022/3 -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:35:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 28 Aug 2018 13:35:14 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10022 ) Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10022/2/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/#/c/10022/2/src/libosmo-mgcp/mgcp_vty.c at 309 PS2, Line 309: SHOW_STR > why are we stopping to dump endpoints just because one of them earlier in the list exposes some oddi [?] Agreed. We can just convert dump_mgcp_endpoint() into a void function. Fixed in next patch set. -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 28 Aug 2018 13:35:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:51:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 13:51:09 +0000 Subject: Change in osmo-bsc[master]: fix unaligned access in abis_nm_rx_ipacc() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10645 ) Change subject: fix unaligned access in abis_nm_rx_ipacc() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia9bdce39472719bfebec29e0a55a021ef45c8ea6 Gerrit-Change-Number: 10645 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 28 Aug 2018 13:51:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:52:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Aug 2018 13:52:39 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9257 to look at the new patch set (#12). Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/gprs_gmm.h A include/osmocom/sgsn/gprs_gmm_attach.h M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 9 files changed, 475 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/12 -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:54:18 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Aug 2018 13:54:18 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/9257 ) Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... Patch Set 12: Code-Review-1 (3 comments) missing UMTS_RESYNC https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c File src/gprs/gprs_gmm_attach.c: https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 143 PS1, Line 143: /* network failure */ > this appears that UMTS AKA is not working with this new FSM? Was it also broken before this FSM? I [?] I talked to neels about this. I'll implemented this. https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 155 PS1, Line 155: struct sgsn_mm_ctx *ctx = fi->priv; > do we want to silently ignore any other events? In other FSMs we explicitly OSMO_ASSERT() on any un [?] It's possible to get other events in case of packet lost. If we get a doublicated event, we can ignore it, because the timeout will resent the packet anyway. https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 175 PS1, Line 175: { > does this mean you're not supporting disabling or enabling of P-TMSI allocation? I believe it shoul [?] It's working in the same way, if PTMSI_ALLOC is defined. I haven't implement the other leg, because the code looked weired and I expected it wasn't used anymore. -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 12 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 28 Aug 2018 13:54:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 13:58:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 13:58:55 +0000 Subject: Change in libosmo-abis[master]: Properly deal with sockaddr_un socket path length limitations. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10647 ) Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10647/1/src/input/unixsocket.c File src/input/unixsocket.c: https://gerrit.osmocom.org/#/c/10647/1/src/input/unixsocket.c at 233 PS1, Line 233: char *sock_path; I think this one can actually be const char*, since osmo_sock_unix_init is already const char*. -- To view, visit https://gerrit.osmocom.org/10647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36344805a825f5d0e0c9d218d438d8fd985ed9ca Gerrit-Change-Number: 10647 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 28 Aug 2018 13:58:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 14:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 28 Aug 2018 14:00:00 +0000 Subject: Change in libosmocore[master]: properly handle mandatory cli param of gsm0808_create_paging2 In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10650 ) Change subject: properly handle mandatory cli param of gsm0808_create_paging2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3716f9d5b210e0a7e6f45c9fe3fc34024e5234ad Gerrit-Change-Number: 10650 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 28 Aug 2018 14:00:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 14:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 14:04:22 +0000 Subject: Change in libosmocore[master]: Properly deal with sockaddr_un socket path length limitations. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10648 ) Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016 Gerrit-Change-Number: 10648 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 28 Aug 2018 14:04:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:06:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 15:06:18 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix sourcecode formatting Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10652 Change subject: cosmetic: fix sourcecode formatting ...................................................................... cosmetic: fix sourcecode formatting Change-Id: Ia112af0b63478bdcf3cfab2537dc1ba08e03dfb1 Related: OS#2975 --- M tests/meas/meas_test.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/10652/1 diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index d40d7cd..e61fd2e 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -326,7 +326,7 @@ lchan = &trx->ts[7].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; lchan->meas.last_fn = 99; - rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); @@ -335,7 +335,7 @@ lchan = &trx->ts[6].lchan[1]; lchan->ts->pchan = GSM_PCHAN_TCH_H; lchan->meas.last_fn = 99; - rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); @@ -344,7 +344,7 @@ lchan = &trx->ts[7].lchan[1]; lchan->ts->pchan = GSM_PCHAN_TCH_H; lchan->meas.last_fn = 99; - rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); @@ -431,7 +431,7 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[0].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+95; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 95; rc = is_meas_overdue(lchan, &fn_missed_end, 17); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 12); @@ -441,27 +441,27 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[6].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+86; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 86; rc = is_meas_overdue(lchan, &fn_missed_end, 8); OSMO_ASSERT(rc); - OSMO_ASSERT(fn_missed_end == GSM_MAX_FN-104+90); + OSMO_ASSERT(fn_missed_end == GSM_MAX_FN - 104 + 90); /* See whats happening if we miss a period-end-triggerend exactly at the * hyperframe ending. */ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[7].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+99; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 99; rc = is_meas_overdue(lchan, &fn_missed_end, 0); OSMO_ASSERT(rc); - OSMO_ASSERT(fn_missed_end == GSM_MAX_FN-1); + OSMO_ASSERT(fn_missed_end == GSM_MAX_FN - 1); /* Test a wrap around at the hyperframe ending, while no measurements * are lost */ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[0].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+99; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 99; rc = is_meas_overdue(lchan, &fn_missed_end, 0); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); @@ -471,7 +471,7 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[0].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+95; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 95; rc = is_meas_overdue(lchan, &fn_missed_end, 4); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); @@ -481,8 +481,8 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[7].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+99; - rc = is_meas_overdue(lchan, &fn_missed_end, GSM_MAX_FN-1); + lchan->meas.last_fn = GSM_MAX_FN - 104 + 99; + rc = is_meas_overdue(lchan, &fn_missed_end, GSM_MAX_FN - 1); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); } -- To view, visit https://gerrit.osmocom.org/10652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia112af0b63478bdcf3cfab2537dc1ba08e03dfb1 Gerrit-Change-Number: 10652 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:06:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 15:06:18 +0000 Subject: Change in osmo-bts[master]: cosmetic: remove wrong comment Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10653 Change subject: cosmetic: remove wrong comment ...................................................................... cosmetic: remove wrong comment is_meas_overdue() does not use is_meas_complete() anymore. Change-Id: I5925fad161843c06e76543d9098c598fe9e72d68 Related: OS#2975 --- M tests/meas/meas_test.c 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/53/10653/1 diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index e61fd2e..ec89df9 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -118,9 +118,6 @@ } -/* This tests the function is_meas_overdue() and since is_meas_overdue() - * internally makes use of is_meas_complete(), this also gives - * is_meas_complete() a detailed check. */ static void test_is_meas_overdue(void) { struct gsm_lchan *lchan; -- To view, visit https://gerrit.osmocom.org/10653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5925fad161843c06e76543d9098c598fe9e72d68 Gerrit-Change-Number: 10653 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:06:18 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 15:06:18 +0000 Subject: Change in osmo-bts[master]: measurement: fix is_meas_overdue() and increase testcoverage Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10654 Change subject: measurement: fix is_meas_overdue() and increase testcoverage ...................................................................... measurement: fix is_meas_overdue() and increase testcoverage The tests TC_meas_res_sign_sdcch4 and TC_meas_res_sign_sdcch8 are failing mainly because lchan->ts->nr is confused with lchan->nr. There is also a small problem with one of the formulas that compute fn_missed_end. - Add explainatory comment to the lookup tables on what the index is refering to - use lchan-nr instead of lchan->ts->nr when dealing with SDCCH/4/8 - simplfy and fix the formula - increase the testcoverage of the unit tests, give SDCCH/4/8 also a thorough check. Change-Id: I5d555a21003943bf720c53f3a611029ba45339a9 Related: OS#2975 --- M src/common/measurement.c M tests/meas/meas_test.c 2 files changed, 231 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/54/10654/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index cb45e6e..2a7d7de 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -114,7 +114,10 @@ * 4 4 and 5 52 to 51 64, 90, 12, 38 * 5 4 and 5 65 to 64 77, 103, 25, 51 * 6 6 and 7 78 to 77 90, 12, 38, 64 - * 7 6 and 7 91 to 90 103, 25, 51, 77 */ + * 7 6 and 7 91 to 90 103, 25, 51, 77 + * + * Note: The array index of the following three lookup tables refes to a + * timeslot number. */ static const uint8_t tchf_meas_rep_fn104[] = { [0] = 90, @@ -155,7 +158,10 @@ * * SDCCH/8 12 to 11 * SDCCH/4 37 to 36 - */ + * + * + * Note: The array index of the following three lookup tables refes to a + * subslot number. */ /* FN of the first burst whose block completes before reaching fn%102=11 */ static const uint8_t sdcch8_meas_rep_fn102[] = { @@ -308,6 +314,7 @@ { uint32_t fn_mod; uint32_t last_fn_mod; + uint32_t fn_rounded; uint8_t interval_end; uint8_t modulus; const uint8_t *tbl; @@ -338,12 +345,12 @@ case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: modulus = 102; - interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; + interval_end = sdcch8_meas_rep_fn102[lchan->nr]; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: modulus = 102; - interval_end = sdcch4_meas_rep_fn102[lchan->ts->nr]; + interval_end = sdcch4_meas_rep_fn102[lchan->nr]; break; default: return false; @@ -352,6 +359,7 @@ fn_mod = fn % modulus; last_fn_mod = lchan->meas.last_fn % modulus; + fn_rounded = fn - fn_mod; if (fn_mod > last_fn_mod) { /* When the current frame number is larger then the last frame @@ -359,7 +367,7 @@ * the two. If it does we calculate the absolute frame number * position on which the interval should have ended. */ if (interval_end > last_fn_mod && interval_end < fn_mod) { - *fn_missed_end = interval_end + fn - fn_mod; + *fn_missed_end = interval_end + fn_rounded; return true; } } else { @@ -372,7 +380,7 @@ if (fn < lchan->meas.last_fn) *fn_missed_end = interval_end + GSM_MAX_FN - modulus; else - *fn_missed_end = interval_end + fn - modulus; + *fn_missed_end = interval_end + fn_rounded - modulus; return true; } /* We also check the section that starts from the beginning of @@ -381,7 +389,7 @@ if (fn < lchan->meas.last_fn) *fn_missed_end = interval_end; else - *fn_missed_end = interval_end + fn - fn_mod; + *fn_missed_end = interval_end + fn_rounded; return true; } } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index ec89df9..d5900e9 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -482,6 +482,222 @@ rc = is_meas_overdue(lchan, &fn_missed_end, GSM_MAX_FN - 1); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* Missing period-end-trigger at fn=66, SDCCH/8, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 15 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 66); + + /* Missing period-end-trigger at fn=70, SDCCH/8, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 51; + rc = is_meas_overdue(lchan, &fn_missed_end, 19 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 70); + + /* Missing period-end-trigger at fn=74, SDCCH/8, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 55; + rc = is_meas_overdue(lchan, &fn_missed_end, 23 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 74); + + /* Missing period-end-trigger at fn=78, SDCCH/8, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 59; + rc = is_meas_overdue(lchan, &fn_missed_end, 27 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 78); + + /* Missing period-end-trigger at fn=98, SDCCH/8, TS0, SS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[4]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 82; + rc = is_meas_overdue(lchan, &fn_missed_end, 31 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 98); + + /* Missing period-end-trigger at fn=102, SDCCH/8, TS0, SS5 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[5]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 35 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 102); + + /* Missing period-end-trigger at fn=106, SDCCH/8, TS0, SS6 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[6]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 90; + rc = is_meas_overdue(lchan, &fn_missed_end, 39 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 4 + 102); + + /* Missing period-end-trigger at fn=200, SDCCH/8, TS0, SS7 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[7]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 94; + rc = is_meas_overdue(lchan, &fn_missed_end, 43 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 8 + 102); + + /* No dropout, SDCCH/8, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 66); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 51; + rc = is_meas_overdue(lchan, &fn_missed_end, 70); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 55; + rc = is_meas_overdue(lchan, &fn_missed_end, 74); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 59; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[4]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 82; + rc = is_meas_overdue(lchan, &fn_missed_end, 98); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS5 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[5]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 102); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS6 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[6]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 90; + rc = is_meas_overdue(lchan, &fn_missed_end, 4 + 102); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS7 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[7]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 94; + rc = is_meas_overdue(lchan, &fn_missed_end, 8 + 102); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* Missing period-end-trigger at fn=88, SDCCH/4, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 57; + rc = is_meas_overdue(lchan, &fn_missed_end, 37 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 88); + + /* Missing period-end-trigger at fn=92, SDCCH/4, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 61; + rc = is_meas_overdue(lchan, &fn_missed_end, 41 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 92); + + /* Missing period-end-trigger at fn=6, SDCCH/4, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = GSM_MAX_FN - 102 + 98; + rc = is_meas_overdue(lchan, &fn_missed_end, 47); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 6); + + /* Missing period-end-trigger at fn=10, SDCCH/4, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 0; + rc = is_meas_overdue(lchan, &fn_missed_end, 51); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 10); + + /* No dropout, SDCCH/4, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 57; + rc = is_meas_overdue(lchan, &fn_missed_end, 88); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/4, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 61; + rc = is_meas_overdue(lchan, &fn_missed_end, 92); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/4, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = GSM_MAX_FN - 102 + 98; + rc = is_meas_overdue(lchan, &fn_missed_end, 6); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/4, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 0; + rc = is_meas_overdue(lchan, &fn_missed_end, 10); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); } /* This tests the robustness of lchan_meas_process_measurement(). This is the -- To view, visit https://gerrit.osmocom.org/10654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d555a21003943bf720c53f3a611029ba45339a9 Gerrit-Change-Number: 10654 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Aug 28 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 28 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#229?= In-Reply-To: <934317247.46.1535382606500.JavaMail.jenkins@jenkins.osmocom.org> References: <934317247.46.1535382606500.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1936289173.57.1535469006615.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:16:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:16:54 +0000 Subject: Change in osmo-bsc[master]: log: 'sending BSSMAP HO Request ACK' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10640 ) Change subject: log: 'sending BSSMAP HO Request ACK' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie472c32861d9c9ca9ebec0221837030ffd83c73a Gerrit-Change-Number: 10640 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 15:16:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:17:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:17:26 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO: send failure msg directly In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10641 ) Change subject: inter-BSC HO: send failure msg directly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic49c94462041800674fa961c4d19c0c045bfe0c0 Gerrit-Change-Number: 10641 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 15:17:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:18:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:18:15 +0000 Subject: Change in osmo-bsc[master]: log: tweaks and more context in osmo_bsc_sigtran_send() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10642 ) Change subject: log: tweaks and more context in osmo_bsc_sigtran_send() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/10642/1/src/osmo-bsc/osmo_bsc_sigtran.c File src/osmo-bsc/osmo_bsc_sigtran.c: https://gerrit.osmocom.org/#/c/10642/1/src/osmo-bsc/osmo_bsc_sigtran.c at 366 PS1, Line 366: Management I would simply have called it BSSMAP here, as we use DTAP as acronym below, too. -- To view, visit https://gerrit.osmocom.org/10642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b Gerrit-Change-Number: 10642 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 15:18:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:18:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:18:35 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix sourcecode formatting In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10652 ) Change subject: cosmetic: fix sourcecode formatting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia112af0b63478bdcf3cfab2537dc1ba08e03dfb1 Gerrit-Change-Number: 10652 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 15:18:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:18:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:18:37 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix sourcecode formatting In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10652 ) Change subject: cosmetic: fix sourcecode formatting ...................................................................... cosmetic: fix sourcecode formatting Change-Id: Ia112af0b63478bdcf3cfab2537dc1ba08e03dfb1 Related: OS#2975 --- M tests/meas/meas_test.c 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index d40d7cd..e61fd2e 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -326,7 +326,7 @@ lchan = &trx->ts[7].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; lchan->meas.last_fn = 99; - rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); @@ -335,7 +335,7 @@ lchan = &trx->ts[6].lchan[1]; lchan->ts->pchan = GSM_PCHAN_TCH_H; lchan->meas.last_fn = 99; - rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); @@ -344,7 +344,7 @@ lchan = &trx->ts[7].lchan[1]; lchan->ts->pchan = GSM_PCHAN_TCH_H; lchan->meas.last_fn = 99; - rc = is_meas_overdue(lchan, &fn_missed_end, 0+104); + rc = is_meas_overdue(lchan, &fn_missed_end, 0 + 104); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 103); @@ -431,7 +431,7 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[0].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+95; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 95; rc = is_meas_overdue(lchan, &fn_missed_end, 17); OSMO_ASSERT(rc); OSMO_ASSERT(fn_missed_end == 12); @@ -441,27 +441,27 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[6].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+86; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 86; rc = is_meas_overdue(lchan, &fn_missed_end, 8); OSMO_ASSERT(rc); - OSMO_ASSERT(fn_missed_end == GSM_MAX_FN-104+90); + OSMO_ASSERT(fn_missed_end == GSM_MAX_FN - 104 + 90); /* See whats happening if we miss a period-end-triggerend exactly at the * hyperframe ending. */ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[7].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+99; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 99; rc = is_meas_overdue(lchan, &fn_missed_end, 0); OSMO_ASSERT(rc); - OSMO_ASSERT(fn_missed_end == GSM_MAX_FN-1); + OSMO_ASSERT(fn_missed_end == GSM_MAX_FN - 1); /* Test a wrap around at the hyperframe ending, while no measurements * are lost */ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[0].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+99; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 99; rc = is_meas_overdue(lchan, &fn_missed_end, 0); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); @@ -471,7 +471,7 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[0].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+95; + lchan->meas.last_fn = GSM_MAX_FN - 104 + 95; rc = is_meas_overdue(lchan, &fn_missed_end, 4); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); @@ -481,8 +481,8 @@ fn_missed_end = LCHAN_FN_DUMMY; lchan = &trx->ts[7].lchan[0]; lchan->ts->pchan = GSM_PCHAN_TCH_F; - lchan->meas.last_fn = GSM_MAX_FN-104+99; - rc = is_meas_overdue(lchan, &fn_missed_end, GSM_MAX_FN-1); + lchan->meas.last_fn = GSM_MAX_FN - 104 + 99; + rc = is_meas_overdue(lchan, &fn_missed_end, GSM_MAX_FN - 1); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); } -- To view, visit https://gerrit.osmocom.org/10652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia112af0b63478bdcf3cfab2537dc1ba08e03dfb1 Gerrit-Change-Number: 10652 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:18:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:18:44 +0000 Subject: Change in osmo-bts[master]: cosmetic: remove wrong comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10653 ) Change subject: cosmetic: remove wrong comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5925fad161843c06e76543d9098c598fe9e72d68 Gerrit-Change-Number: 10653 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 15:18:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:20:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:20:52 +0000 Subject: Change in osmo-bts[master]: measurement: fix is_meas_overdue() and increase testcoverage In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10654 ) Change subject: measurement: fix is_meas_overdue() and increase testcoverage ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/10654/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10654/1/src/common/measurement.c at 122 PS1, Line 122: static const uint8_t tchf_meas_rep_fn104[] = { I suggest to name them sdcch*_meas_re_fn102_by_ts[] or _by_tn[] to make it clear what the index is. Makes the code more readable. https://gerrit.osmocom.org/#/c/10654/1/src/common/measurement.c at 167 PS1, Line 167: sdcch8_meas_rep_fn102 I suggest to name them sdcch*_meas_re_fn102_by_ss[] or _by_subslot[] to make it clear what the index is. Makes the code more readible. -- To view, visit https://gerrit.osmocom.org/10654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d555a21003943bf720c53f3a611029ba45339a9 Gerrit-Change-Number: 10654 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 28 Aug 2018 15:20:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:20:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:20:55 +0000 Subject: Change in osmo-bts[master]: cosmetic: remove wrong comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10653 ) Change subject: cosmetic: remove wrong comment ...................................................................... cosmetic: remove wrong comment is_meas_overdue() does not use is_meas_complete() anymore. Change-Id: I5925fad161843c06e76543d9098c598fe9e72d68 Related: OS#2975 --- M tests/meas/meas_test.c 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index e61fd2e..ec89df9 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -118,9 +118,6 @@ } -/* This tests the function is_meas_overdue() and since is_meas_overdue() - * internally makes use of is_meas_complete(), this also gives - * is_meas_complete() a detailed check. */ static void test_is_meas_overdue(void) { struct gsm_lchan *lchan; -- To view, visit https://gerrit.osmocom.org/10653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5925fad161843c06e76543d9098c598fe9e72d68 Gerrit-Change-Number: 10653 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:21:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:21:59 +0000 Subject: Change in libosmo-abis[master]: Properly deal with sockaddr_un socket path length limitations. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10647 ) Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36344805a825f5d0e0c9d218d438d8fd985ed9ca Gerrit-Change-Number: 10647 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 28 Aug 2018 15:21:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:22:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:22:23 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10651 ) Change subject: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64408b2095fb2aea24c0306673aa40279ea9f75f Gerrit-Change-Number: 10651 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 28 Aug 2018 15:22:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:22:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:22:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: don't re-use the same NS for all 3 BSSGP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10649 ) Change subject: sgsn: don't re-use the same NS for all 3 BSSGP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09 Gerrit-Change-Number: 10649 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 28 Aug 2018 15:22:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:23:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:23:34 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10022 ) Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 28 Aug 2018 15:23:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:23:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 28 Aug 2018 15:23:36 +0000 Subject: Change in osmo-mgw[master]: add VTY commands which show specific mgcp endpoints In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10022 ) Change subject: add VTY commands which show specific mgcp endpoints ...................................................................... add VTY commands which show specific mgcp endpoints Add VTY commands "show mgcp endpoint NAME" and "show mgcp trunk <0-64> endpoint NAME" which show information about specific endpoints. Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Related: OS#2660 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 106 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 00af3bd..75cc52f 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -31,6 +31,7 @@ #include #include +#include #define RTCP_OMIT_STR "Drop RTCP packets in both directions\n" #define RTP_PATCH_STR "Modify RTP packet header in both directions\n" @@ -184,13 +185,40 @@ end->force_output_ptime, VTY_NEWLINE); } -static void dump_trunk(struct vty *vty, struct mgcp_trunk_config *cfg, - int verbose) +static void dump_endpoint(struct vty *vty, struct mgcp_endpoint *endp, int epidx, + int trunk_nr, enum mgcp_trunk_type trunk_type, int show_stats) { - int i; struct mgcp_conn *conn; - vty_out(vty, "%s trunk nr %d with %d endpoints:%s", + vty_out(vty, "%s trunk %d endpoint %s%.2x:%s", + trunk_type == MGCP_TRUNK_VIRTUAL ? "Virtual" : "E1", trunk_nr, + trunk_type == MGCP_TRUNK_VIRTUAL ? MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK : "", + epidx, VTY_NEWLINE); + + if (llist_empty(&endp->conns)) { + vty_out(vty, " No active connections%s", VTY_NEWLINE); + return; + } + + llist_for_each_entry(conn, &endp->conns, entry) { + vty_out(vty, " CONN: %s%s", mgcp_conn_dump(conn), VTY_NEWLINE); + + if (show_stats) { + /* FIXME: Also add verbosity for other + * connection types (E1) as soon as + * the implementation is available */ + if (conn->type == MGCP_CONN_TYPE_RTP) { + dump_rtp_end(vty, &conn->u.rtp); + } + } + } +} + +static void dump_trunk(struct vty *vty, struct mgcp_trunk_config *cfg, int show_stats) +{ + int i; + + vty_out(vty, "%s trunk %d with %d endpoints:%s", cfg->trunk_type == MGCP_TRUNK_VIRTUAL ? "Virtual" : "E1", cfg->trunk_nr, cfg->number_endpoints - 1, VTY_NEWLINE); @@ -201,29 +229,18 @@ for (i = 1; i < cfg->number_endpoints; ++i) { struct mgcp_endpoint *endp = &cfg->endpoints[i]; - - vty_out(vty, "Endpoint 0x%.2x:%s", i, VTY_NEWLINE); - - llist_for_each_entry(conn, &endp->conns, entry) { - vty_out(vty, " CONN: %s%s", - mgcp_conn_dump(conn), VTY_NEWLINE); - - if (verbose) { - /* FIXME: Also add verbosity for other - * connection types (E1) as soon as - * the implementation is available */ - if (conn->type == MGCP_CONN_TYPE_RTP) { - dump_rtp_end(vty, &conn->u.rtp); - } - } - } + dump_endpoint(vty, endp, i, cfg->trunk_nr, cfg->trunk_type, show_stats); + if (i < cfg->number_endpoints - 1) + vty_out(vty, "%s", VTY_NEWLINE); } } +#define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n" + DEFUN(show_mcgp, show_mgcp_cmd, "show mgcp [stats]", SHOW_STR - "Display information about the MGCP Media Gateway\n" + SHOW_MGCP_STR "Include Statistics\n") { struct mgcp_trunk_config *trunk; @@ -241,6 +258,72 @@ return CMD_SUCCESS; } +static void +dump_mgcp_endpoint(struct vty *vty, struct mgcp_trunk_config *trunk, const char *epname) +{ + const size_t virt_prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK) - 1; + unsigned long epidx; + char *endp; + int i; + + if (strncmp(epname, MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK, virt_prefix_len) == 0) + epname += virt_prefix_len; + errno = 0; + epidx = strtoul(epname, &endp, 16); + if (epname[0] == '\0' || *endp != '\0') { + vty_out(vty, "endpoint name '%s' is not a hex number%s", epname, VTY_NEWLINE); + return; + } + if ((errno == ERANGE && epidx == ULONG_MAX) /* parsed value out of range */ + || epidx >= trunk->number_endpoints) { + vty_out(vty, "endpoint %.2lx not configured on trunk %d%s", epidx, trunk->trunk_nr, VTY_NEWLINE); + return; + } + + for (i = 0; i < trunk->number_endpoints; ++i) { + struct mgcp_endpoint *endp = &trunk->endpoints[i]; + if (i == epidx) { + dump_endpoint(vty, endp, i, trunk->trunk_nr, trunk->trunk_type, true); + break; + } + } +} + +DEFUN(show_mcgp_endpoint, show_mgcp_endpoint_cmd, + "show mgcp endpoint NAME", + SHOW_STR + SHOW_MGCP_STR + "Display information about an endpoint\n" "The name of the endpoint\n") +{ + struct mgcp_trunk_config *trunk; + + dump_mgcp_endpoint(vty, &g_cfg->trunk, argv[0]); + llist_for_each_entry(trunk, &g_cfg->trunks, entry) + dump_mgcp_endpoint(vty, trunk, argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(show_mcgp_trunk_endpoint, show_mgcp_trunk_endpoint_cmd, + "show mgcp trunk <0-64> endpoint NAME", + SHOW_STR + SHOW_MGCP_STR + "Display information about a trunk\n" "Trunk number\n" + "Display information about an endpoint\n" "The name of the endpoint\n") +{ + struct mgcp_trunk_config *trunk; + int trunkidx = atoi(argv[0]); + + trunk = find_trunk(g_cfg, trunkidx); + if (!trunk) { + vty_out(vty, "trunk %d not found%s", trunkidx, VTY_NEWLINE); + return CMD_WARNING; + } + + dump_mgcp_endpoint(vty, trunk, argv[1]); + return CMD_SUCCESS; +} + DEFUN(cfg_mgcp, cfg_mgcp_cmd, "mgcp", "Configure the MGCP") { vty->node = MGCP_NODE; @@ -1219,6 +1302,8 @@ int mgcp_vty_init(void) { install_element_ve(&show_mgcp_cmd); + install_element_ve(&show_mgcp_endpoint_cmd); + install_element_ve(&show_mgcp_trunk_endpoint_cmd); install_element(ENABLE_NODE, &loop_conn_cmd); install_element(ENABLE_NODE, &tap_rtp_cmd); install_element(ENABLE_NODE, &free_endp_cmd); -- To view, visit https://gerrit.osmocom.org/10022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5330e697ec34bf215de91d44209048a8dc226d51 Gerrit-Change-Number: 10022 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:43:22 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 15:43:22 +0000 Subject: Change in osmo-bts[master]: cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10655 Change subject: cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s ...................................................................... cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s The lookup table that control the measurement interval endings do not make clear what their indexes refer to. Lets give them more distinct names. rename sdcch8_meas_rep_fn102 to sdcch8_meas_re_fn102_by_ss rename sdcch4_meas_rep_fn102 to sdcch4_meas_re_fn102_by_ss rename tchf_meas_rep_fn104 to tchf_meas_re_fn104_by_ts rename tchh0_meas_rep_fn104 to tchh0_meas_re_fn104_by_ts rename tchh1_meas_rep_fn104 to tchh1_meas_re_fn104_by_ts Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Related: OS#2975 --- M src/common/measurement.c 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/10655/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 2a7d7de..3ce7882 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -119,7 +119,7 @@ * Note: The array index of the following three lookup tables refes to a * timeslot number. */ -static const uint8_t tchf_meas_rep_fn104[] = { +static const uint8_t tchf_meas_re_fn104_by_ts[] = { [0] = 90, [1] = 103, [2] = 12, @@ -129,7 +129,7 @@ [6] = 64, [7] = 77, }; -static const uint8_t tchh0_meas_rep_fn104[] = { +static const uint8_t tchh0_meas_re_fn104_by_ts[] = { [0] = 90, [1] = 90, [2] = 12, @@ -139,7 +139,7 @@ [6] = 64, [7] = 64, }; -static const uint8_t tchh1_meas_rep_fn104[] = { +static const uint8_t tchh1_meas_re_fn104_by_ts[] = { [0] = 103, [1] = 103, [2] = 25, @@ -164,7 +164,7 @@ * subslot number. */ /* FN of the first burst whose block completes before reaching fn%102=11 */ -static const uint8_t sdcch8_meas_rep_fn102[] = { +static const uint8_t sdcch8_meas_re_fn102_by_ss[] = { [0] = 66, /* 15(SDCCH), 47(SACCH), 66(SDCCH) */ [1] = 70, /* 19(SDCCH), 51(SACCH), 70(SDCCH) */ [2] = 74, /* 23(SDCCH), 55(SACCH), 74(SDCCH) */ @@ -176,7 +176,7 @@ }; /* FN of the first burst whose block completes before reaching fn%102=37 */ -static const uint8_t sdcch4_meas_rep_fn102[] = { +static const uint8_t sdcch4_meas_re_fn102_by_ss[] = { [0] = 88, /* 37(SDCCH), 57(SACCH), 88(SDCCH) */ [1] = 92, /* 41(SDCCH), 61(SACCH), 92(SDCCH) */ [2] = 6, /* 6(SACCH), 47(SDCCH), 98(SDCCH) */ @@ -195,7 +195,7 @@ * Table 1 of 9) what value we need to feed into the lookup tables in order to * detect the measurement period ending. In this example the "real" ending * was on FN%104=12. This is the value we have to look for in - * tchf_meas_rep_fn104 to know that a measurement period has just ended. */ + * tchf_meas_re_fn104_by_ts to know that a measurement period has just ended. */ /* See also 3GPP TS 05.02 Clause 7 Table 1 of 9: * Mapping of logical channels onto physical channels (see subclauses 6.3, 6.4, 6.5) */ @@ -266,28 +266,28 @@ switch (pchan) { case GSM_PCHAN_TCH_F: fn_mod = translate_tch_meas_rep_fn104(fn % 104); - if (tchf_meas_rep_fn104[lchan->ts->nr] == fn_mod) + if (tchf_meas_re_fn104_by_ts[lchan->ts->nr] == fn_mod) rc = 1; break; case GSM_PCHAN_TCH_H: fn_mod = translate_tch_meas_rep_fn104(fn % 104); if (lchan->nr == 0) - tbl = tchh0_meas_rep_fn104; + tbl = tchh0_meas_re_fn104_by_ts; else - tbl = tchh1_meas_rep_fn104; + tbl = tchh1_meas_re_fn104_by_ts; if (tbl[lchan->ts->nr] == fn_mod) rc = 1; break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: fn_mod = fn % 102; - if (sdcch8_meas_rep_fn102[lchan->nr] == fn_mod) + if (sdcch8_meas_re_fn102_by_ss[lchan->nr] == fn_mod) rc = 1; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: fn_mod = fn % 102; - if (sdcch4_meas_rep_fn102[lchan->nr] == fn_mod) + if (sdcch4_meas_re_fn102_by_ss[lchan->nr] == fn_mod) rc = 1; break; default: @@ -330,27 +330,27 @@ switch (pchan) { case GSM_PCHAN_TCH_F: modulus = 104; - interval_end = tchf_meas_rep_fn104[lchan->ts->nr]; + interval_end = tchf_meas_re_fn104_by_ts[lchan->ts->nr]; interval_end = translate_tch_meas_rep_fn104_inv(interval_end); break; case GSM_PCHAN_TCH_H: modulus = 104; if (lchan->nr == 0) - tbl = tchh0_meas_rep_fn104; + tbl = tchh0_meas_re_fn104_by_ts; else - tbl = tchh1_meas_rep_fn104; + tbl = tchh1_meas_re_fn104_by_ts; interval_end = tbl[lchan->ts->nr]; interval_end = translate_tch_meas_rep_fn104_inv(interval_end); break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: modulus = 102; - interval_end = sdcch8_meas_rep_fn102[lchan->nr]; + interval_end = sdcch8_meas_re_fn102_by_ss[lchan->nr]; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: modulus = 102; - interval_end = sdcch4_meas_rep_fn102[lchan->nr]; + interval_end = sdcch4_meas_re_fn102_by_ss[lchan->nr]; break; default: return false; -- To view, visit https://gerrit.osmocom.org/10655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Gerrit-Change-Number: 10655 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 15:44:30 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 15:44:30 +0000 Subject: Change in osmo-bts[master]: measurement: fix is_meas_overdue() and increase testcoverage In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10654 ) Change subject: measurement: fix is_meas_overdue() and increase testcoverage ...................................................................... Patch Set 1: (2 comments) > (2 comments) https://gerrit.osmocom.org/#/c/10654/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/#/c/10654/1/src/common/measurement.c at 122 PS1, Line 122: static const uint8_t tchf_meas_rep_fn104[] = { > I suggest to name them sdcch*_meas_re_fn102_by_ts[] or _by_tn[] to make it clear what the index is. [?] Done https://gerrit.osmocom.org/#/c/10654/1/src/common/measurement.c at 167 PS1, Line 167: sdcch8_meas_rep_fn102 > I suggest to name them sdcch*_meas_re_fn102_by_ss[] or _by_subslot[] to make it clear what the index [?] I think that makes sense but I have put this into a separate patch. -- To view, visit https://gerrit.osmocom.org/10654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d555a21003943bf720c53f3a611029ba45339a9 Gerrit-Change-Number: 10654 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 28 Aug 2018 15:44:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:33:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 16:33:53 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_client_read Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10656 Change subject: ipa: Simplify code in ipa_client_read ...................................................................... ipa: Simplify code in ipa_client_read By doing this change we remove a duplicated error code path and thus avoid having to maintain an extra code path with function pointers. Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3 --- M src/input/ipa.c 1 file changed, 4 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/56/10656/1 diff --git a/src/input/ipa.c b/src/input/ipa.c index 995d2c3..26bf170 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -56,17 +56,13 @@ LOGIPA(link, LOGL_DEBUG, "message received\n"); ret = ipa_msg_recv_buffered(ofd->fd, &msg, &link->pending_msg); - if (ret < 0) { + if (ret <= 0) { if (ret == -EAGAIN) return; - if (ret == -EPIPE || ret == -ECONNRESET) + else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(link, LOGL_ERROR, "lost connection with server\n"); - ipa_client_conn_close(link); - if (link->updown_cb) - link->updown_cb(link, 0); - return; - } else if (ret == 0) { - LOGIPA(link, LOGL_ERROR, "connection closed with server\n"); + else if (ret == 0) + LOGIPA(link, LOGL_ERROR, "connection closed with server\n"); ipa_client_conn_close(link); if (link->updown_cb) link->updown_cb(link, 0); -- To view, visit https://gerrit.osmocom.org/10656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3 Gerrit-Change-Number: 10656 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:33:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 16:33:54 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_server_conn_read Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10657 Change subject: ipa: Simplify code in ipa_server_conn_read ...................................................................... ipa: Simplify code in ipa_server_conn_read By doing this change we remove a duplicated error code path and thus avoid having to maintain an extra code path with function pointers. Change-Id: I5bce9f92209cc2fb37b78792e34f7898c71d2327 --- M src/input/ipa.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/57/10657/1 diff --git a/src/input/ipa.c b/src/input/ipa.c index 26bf170..554644c 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -336,15 +336,13 @@ LOGIPA(conn, LOGL_DEBUG, "message received\n"); ret = ipa_msg_recv_buffered(ofd->fd, &msg, &conn->pending_msg); - if (ret < 0) { + if (ret <= 0) { if (ret == -EAGAIN) return; - if (ret == -EPIPE || ret == -ECONNRESET) + else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(conn, LOGL_ERROR, "lost connection with server\n"); - ipa_server_conn_destroy(conn); - return; - } else if (ret == 0) { - LOGIPA(conn, LOGL_ERROR, "connection closed with server\n"); + else if (ret == 0) + LOGIPA(conn, LOGL_ERROR, "connection closed with server\n"); ipa_server_conn_destroy(conn); return; } -- To view, visit https://gerrit.osmocom.org/10657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5bce9f92209cc2fb37b78792e34f7898c71d2327 Gerrit-Change-Number: 10657 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:33:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 16:33:54 +0000 Subject: Change in libosmo-abis[master]: ipa: Allow signalling fd destroyed in ipa_client_read Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10658 Change subject: ipa: Allow signalling fd destroyed in ipa_client_read ...................................................................... ipa: Allow signalling fd destroyed in ipa_client_read Similar to what we do in other osmo_fd cb, check for read_cb returning -EBADF and in that case don't attempt using the osmo_fd anymore, either because the fd was already closed (no need to then signal WRITE) or because osmo_fd struct itself has been freed. Change-Id: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1 --- M include/osmocom/abis/ipa.h M src/input/ipa.c 2 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/58/10658/1 diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index a157889..4359268 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -71,6 +71,7 @@ const char *addr; uint16_t port; void (*updown_cb)(struct ipa_client_conn *link, int up); + /* Callback when ofd has something to be read. -EBADF must be returned if the osmo_fd is destroyed. */ int (*read_cb)(struct ipa_client_conn *link, struct msgb *msg); int (*write_cb)(struct ipa_client_conn *link); void *data; diff --git a/src/input/ipa.c b/src/input/ipa.c index 554644c..d0363e2 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -47,7 +47,7 @@ link->pending_msg = NULL; } -static void ipa_client_read(struct ipa_client_conn *link) +static int ipa_client_read(struct ipa_client_conn *link) { struct osmo_fd *ofd = link->ofd; struct msgb *msg; @@ -58,7 +58,7 @@ ret = ipa_msg_recv_buffered(ofd->fd, &msg, &link->pending_msg); if (ret <= 0) { if (ret == -EAGAIN) - return; + return 0; else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(link, LOGL_ERROR, "lost connection with server\n"); else if (ret == 0) @@ -66,10 +66,11 @@ ipa_client_conn_close(link); if (link->updown_cb) link->updown_cb(link, 0); - return; + return -EBADF; } if (link->read_cb) - link->read_cb(link, msg); + return link->read_cb(link, msg); + return 0; } static void ipa_client_write(struct ipa_client_conn *link) @@ -111,7 +112,7 @@ static int ipa_client_fd_cb(struct osmo_fd *ofd, unsigned int what) { struct ipa_client_conn *link = ofd->data; - int error, ret; + int error, ret = 0; socklen_t len = sizeof(error); switch(link->state) { @@ -132,9 +133,9 @@ case IPA_CLIENT_LINK_STATE_CONNECTED: if (what & BSC_FD_READ) { LOGIPA(link, LOGL_DEBUG, "connected read\n"); - ipa_client_read(link); + ret = ipa_client_read(link); } - if (what & BSC_FD_WRITE) { + if (ret != -EBADF && (what & BSC_FD_WRITE)) { LOGIPA(link, LOGL_DEBUG, "connected write\n"); ipa_client_write(link); } -- To view, visit https://gerrit.osmocom.org/10658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1 Gerrit-Change-Number: 10658 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:33:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 16:33:54 +0000 Subject: Change in libosmo-abis[master]: ipa: Allow signalling fd destroyed in ipa_server_conn_read Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10659 Change subject: ipa: Allow signalling fd destroyed in ipa_server_conn_read ...................................................................... ipa: Allow signalling fd destroyed in ipa_server_conn_read Similar to what we do in other osmo_fd cb, check for read_cb returning -EBADF and in that case don't attempt using the osmo_fd anymore, either because the fd was already closed (no need to then signal WRITE) or because osmo_fd struct itself has been freed. Change-Id: I4b968b72285f23a9552519cea67398a43d5003d2 --- M include/osmocom/abis/ipa.h M src/input/ipa.c 2 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/59/10659/1 diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index 4359268..a738156 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -37,6 +37,7 @@ int (*closed_cb)(struct ipa_server_conn *peer); int (*ccm_cb)(struct ipa_server_conn *peer, struct msgb *msg, struct tlv_parsed *tlvp, struct ipaccess_unit *ud); + /* Callback when ofd has something to be read. -EBADF must be returned if the osmo_fd is destroyed. */ int (*cb)(struct ipa_server_conn *peer, struct msgb *msg); void *data; struct msgb *pending_msg; diff --git a/src/input/ipa.c b/src/input/ipa.c index d0363e2..09e3426 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -328,7 +328,7 @@ close(link->ofd.fd); } -static void ipa_server_conn_read(struct ipa_server_conn *conn) +static int ipa_server_conn_read(struct ipa_server_conn *conn) { struct osmo_fd *ofd = &conn->ofd; struct msgb *msg; @@ -339,18 +339,18 @@ ret = ipa_msg_recv_buffered(ofd->fd, &msg, &conn->pending_msg); if (ret <= 0) { if (ret == -EAGAIN) - return; + return 0; else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(conn, LOGL_ERROR, "lost connection with server\n"); else if (ret == 0) LOGIPA(conn, LOGL_ERROR, "connection closed with server\n"); ipa_server_conn_destroy(conn); - return; + return -EBADF; } if (conn->cb) - conn->cb(conn, msg); + return conn->cb(conn, msg); - return; + return 0; } static void ipa_server_conn_write(struct ipa_server_conn *conn) @@ -376,11 +376,12 @@ static int ipa_server_conn_cb(struct osmo_fd *ofd, unsigned int what) { struct ipa_server_conn *conn = ofd->data; + int rc = 0; LOGP(DLINP, LOGL_DEBUG, "connected read/write\n"); if (what & BSC_FD_READ) - ipa_server_conn_read(conn); - if (what & BSC_FD_WRITE) + rc = ipa_server_conn_read(conn); + if (rc != -EBADF && (what & BSC_FD_WRITE)) ipa_server_conn_write(conn); return 0; -- To view, visit https://gerrit.osmocom.org/10659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b968b72285f23a9552519cea67398a43d5003d2 Gerrit-Change-Number: 10659 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:33:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 16:33:55 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10660 Change subject: ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb ...................................................................... ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb As we are closing the socket, there's no need for lower layers to continue handling it, so let's return -EBADF. Change-Id: I961b0ef7e598a09ce48a83038c0d90a415e0e11c --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/60/10660/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index cce1654..24a79ea 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -738,7 +738,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } } @@ -758,7 +757,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } } @@ -774,16 +772,14 @@ if (e1i_ts->type == E1INP_TS_TYPE_NONE) { LOGP(DLINP, LOGL_ERROR, "Signalling link not initialized. Discarding." " port=%u msg_type=%u\n", link->port, msg_type); - ret = -EIO; goto err; } - + /* look up for some existing signaling link. */ sign_link = e1inp_lookup_sign_link(e1i_ts, hh->proto, 0); if (sign_link == NULL) { LOGP(DLINP, LOGL_ERROR, "no matching signalling link for " "hh->proto=0x%02x\n", hh->proto); - ret = -EIO; goto err; } msg->dst = sign_link; @@ -792,7 +788,6 @@ if (!link->line->ops->sign_link) { LOGP(DLINP, LOGL_ERROR, "Fix your application, " "no action set for signalling messages.\n"); - ret = -ENOENT; goto err; } link->line->ops->sign_link(msg); @@ -801,7 +796,7 @@ err: ipa_client_conn_close(link); msgb_free(msg); - return ret; + return -EBADF; } struct ipaccess_line { -- To view, visit https://gerrit.osmocom.org/10660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I961b0ef7e598a09ce48a83038c0d90a415e0e11c Gerrit-Change-Number: 10660 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:33:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 16:33:55 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Allow passing return code in e1inp_line_ops->sign_link() Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10661 Change subject: ipaccess: Allow passing return code in e1inp_line_ops->sign_link() ...................................................................... ipaccess: Allow passing return code in e1inp_line_ops->sign_link() Change-Id: Ia83eead3622d86f55c1dc5e91acc78dde73a0367 --- M include/osmocom/abis/e1_input.h M src/input/ipaccess.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/61/10661/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 3fbce5b..79455e1 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -173,6 +173,7 @@ struct e1inp_sign_link * (*sign_link_up)(void *unit_info, struct e1inp_line *line, enum e1inp_sign_type type); void (*sign_link_down)(struct e1inp_line *line); + /* Called when a new message arrives. -EBADF must be returned if the osmo_fd in link (msg->dst) is destroyed. */ int (*sign_link)(struct msgb *msg); }; diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 24a79ea..566fd64 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -279,7 +279,7 @@ " sign_link returned error: %s.\n", strerror(-rc)); } - return 0; + return rc; err_msg: msgb_free(msg); err: @@ -790,8 +790,7 @@ "no action set for signalling messages.\n"); goto err; } - link->line->ops->sign_link(msg); - return 0; + return link->line->ops->sign_link(msg); err: ipa_client_conn_close(link); -- To view, visit https://gerrit.osmocom.org/10661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia83eead3622d86f55c1dc5e91acc78dde73a0367 Gerrit-Change-Number: 10661 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:39:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 28 Aug 2018 16:39:51 +0000 Subject: Change in osmo-bts[master]: cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10655 ) Change subject: cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s ...................................................................... Patch Set 1: Any reason of s/rep/re/? I think adding postfix would be enough. -- To view, visit https://gerrit.osmocom.org/10655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Gerrit-Change-Number: 10655 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 28 Aug 2018 16:39:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 16:44:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 16:44:42 +0000 Subject: Change in openbsc[master]: gsm_data.h: Replace '.' in counter names with ':' Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10662 Change subject: gsm_data.h: Replace '.' in counter names with ':' ...................................................................... gsm_data.h: Replace '.' in counter names with ':' The '.' is illegal character in counter names, as they are exported via CTRL interface, where '.' has a special meaning that cannot be used by strings comprising the variable name. Change-Id: I075c0f992e2e31226bd04b9c036ca125467f840e --- M openbsc/include/openbsc/gsm_data.h 1 file changed, 39 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/62/10662/1 diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 2e1e64f..f3d85ac 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -206,26 +206,26 @@ }; static const struct rate_ctr_desc bsc_ctr_description[] = { - [BSC_CTR_CHREQ_TOTAL] = {"chreq.total", "Received channel requests."}, - [BSC_CTR_CHREQ_NO_CHANNEL] = {"chreq.no_channel", "Sent to MS no channel available."}, - [BSC_CTR_HANDOVER_ATTEMPTED] = {"handover.attempted", "Received handover attempts."}, - [BSC_CTR_HANDOVER_NO_CHANNEL] = {"handover.no_channel", "Sent no channel available responses."}, - [BSC_CTR_HANDOVER_TIMEOUT] = {"handover.timeout", "Count the amount of timeouts of timer T3103."}, - [BSC_CTR_HANDOVER_COMPLETED] = {"handover.completed", "Received handover completed."}, - [BSC_CTR_HANDOVER_FAILED] = {"handover.failed", "Receive HO FAIL messages."}, - [BSC_CTR_PAGING_ATTEMPTED] = {"paging.attempted", "Paging attempts for a MS."}, - [BSC_CTR_PAGING_DETACHED] = {"paging.detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."}, - [BSC_CTR_PAGING_COMPLETED] = {"paging.completed", "Paging successful completed."}, - [BSC_CTR_PAGING_EXPIRED] = {"paging.expired", "Paging Request expired because of timeout T3113."}, - [BSC_CTR_CHAN_RF_FAIL] = {"chan.rf_fail", "Received a RF failure indication from BTS."}, - [BSC_CTR_CHAN_RLL_ERR] = {"chan.rll_err", "Received a RLL failure with T200 cause from BTS."}, - [BSC_CTR_BTS_OML_FAIL] = {"bts.oml_fail", "Received a TEI down on a OML link."}, - [BSC_CTR_BTS_RSL_FAIL] = {"bts.rsl_fail", "Received a TEI down on a OML link."}, - [BSC_CTR_CODEC_AMR_F] = {"bts.codec_amr_f", "Count the usage of AMR/F codec by channel mode requested."}, - [BSC_CTR_CODEC_AMR_H] = {"bts.codec_amr_h", "Count the usage of AMR/H codec by channel mode requested."}, - [BSC_CTR_CODEC_EFR] = {"bts.codec_efr", "Count the usage of EFR codec by channel mode requested."}, - [BSC_CTR_CODEC_V1_FR] = {"bts.codec_fr", "Count the usage of FR codec by channel mode requested."}, - [BSC_CTR_CODEC_V1_HR] = {"bts.codec_hr", "Count the usage of HR codec by channel mode requested."}, + [BSC_CTR_CHREQ_TOTAL] = {"chreq:total", "Received channel requests."}, + [BSC_CTR_CHREQ_NO_CHANNEL] = {"chreq:no_channel", "Sent to MS no channel available."}, + [BSC_CTR_HANDOVER_ATTEMPTED] = {"handover:attempted", "Received handover attempts."}, + [BSC_CTR_HANDOVER_NO_CHANNEL] = {"handover:no_channel", "Sent no channel available responses."}, + [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Count the amount of timeouts of timer T3103."}, + [BSC_CTR_HANDOVER_COMPLETED] = {"handover:completed", "Received handover completed."}, + [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Receive HO FAIL messages."}, + [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a MS."}, + [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."}, + [BSC_CTR_PAGING_COMPLETED] = {"paging:completed", "Paging successful completed."}, + [BSC_CTR_PAGING_EXPIRED] = {"paging:expired", "Paging Request expired because of timeout T3113."}, + [BSC_CTR_CHAN_RF_FAIL] = {"chan:rf_fail", "Received a RF failure indication from BTS."}, + [BSC_CTR_CHAN_RLL_ERR] = {"chan:rll_err", "Received a RLL failure with T200 cause from BTS."}, + [BSC_CTR_BTS_OML_FAIL] = {"bts:oml_fail", "Received a TEI down on a OML link."}, + [BSC_CTR_BTS_RSL_FAIL] = {"bts:rsl_fail", "Received a TEI down on a OML link."}, + [BSC_CTR_CODEC_AMR_F] = {"bts:codec_amr_f", "Count the usage of AMR/F codec by channel mode requested."}, + [BSC_CTR_CODEC_AMR_H] = {"bts:codec_amr_h", "Count the usage of AMR/H codec by channel mode requested."}, + [BSC_CTR_CODEC_EFR] = {"bts:codec_efr", "Count the usage of EFR codec by channel mode requested."}, + [BSC_CTR_CODEC_V1_FR] = {"bts:codec_fr", "Count the usage of FR codec by channel mode requested."}, + [BSC_CTR_CODEC_V1_HR] = {"bts:codec_hr", "Count the usage of HR codec by channel mode requested."}, }; enum { @@ -251,26 +251,26 @@ }; static const struct rate_ctr_desc msc_ctr_description[] = { - [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type.attach", "Received location update imsi attach requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type.normal", "Received location update normal requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type.periodic", "Received location update periodic requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type.detach", "Received location update detach indication."}, - [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp.failed", "Rejected location updates."}, - [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp.completed", "Successful location updates."}, - [MSC_CTR_SMS_SUBMITTED] = {"sms.submitted", "Received a RPDU from a MS (MO)."}, - [MSC_CTR_SMS_NO_RECEIVER] = {"sms.no_receiver", "Counts SMS which couldn't routed because no receiver found."}, - [MSC_CTR_SMS_DELIVERED] = {"sms.delivered", "Global SMS Deliver attempts."}, - [MSC_CTR_SMS_RP_ERR_MEM] = {"sms.rp_err_mem", "CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt."}, - [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms.rp_err_other", "Other error of MS responses on a sms delive attempt."}, - [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms.deliver_unknown_error", "Unknown error occured during sms delivery."}, + [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type:attach", "Received location update imsi attach requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type:normal", "Received location update normal requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type:periodic", "Received location update periodic requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received location update detach indication."}, + [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected location updates."}, + [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful location updates."}, + [MSC_CTR_SMS_SUBMITTED] = {"sms:submitted", "Received a RPDU from a MS (MO)."}, + [MSC_CTR_SMS_NO_RECEIVER] = {"sms:no_receiver", "Counts SMS which couldn't routed because no receiver found."}, + [MSC_CTR_SMS_DELIVERED] = {"sms:delivered", "Global SMS Deliver attempts."}, + [MSC_CTR_SMS_RP_ERR_MEM] = {"sms:rp_err_mem", "CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt."}, + [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms:rp_err_other", "Other error of MS responses on a sms delive attempt."}, + [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms:deliver_unknown_error", "Unknown error occured during sms delivery."}, /* FIXME: count also sms delivered */ - [MSC_CTR_CALL_MO_SETUP] = {"call.mo_setup", "Received setup requests from a MS to init a MO call."}, - [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call.mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now succesful connected up."}, - [MSC_CTR_CALL_MT_SETUP] = {"call.mt_setup", "Sent setup requests to the MS (MT)."}, - [MSC_CTR_CALL_MT_CONNECT] = {"call.mt_connect", "Sent a connect to the MS (MT)."}, - [MSC_CTR_CALL_ACTIVE] = {"call.active", "Count total amount of calls that ever reached active state."}, - [MSC_CTR_CALL_COMPLETE] = {"call.complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."}, - [MSC_CTR_CALL_INCOMPLETE] = {"call.incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."}, + [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received setup requests from a MS to init a MO call."}, + [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now succesful connected up."}, + [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent setup requests to the MS (MT)."}, + [MSC_CTR_CALL_MT_CONNECT] = {"call:mt_connect", "Sent a connect to the MS (MT)."}, + [MSC_CTR_CALL_ACTIVE] = {"call:active", "Count total amount of calls that ever reached active state."}, + [MSC_CTR_CALL_COMPLETE] = {"call:complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."}, + [MSC_CTR_CALL_INCOMPLETE] = {"call:incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."}, }; -- To view, visit https://gerrit.osmocom.org/10662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I075c0f992e2e31226bd04b9c036ca125467f840e Gerrit-Change-Number: 10662 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:02:13 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 17:02:13 +0000 Subject: Change in osmo-bts[master]: measurement: add unit tests for is_meas_complete() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10663 Change subject: measurement: add unit tests for is_meas_complete() ...................................................................... measurement: add unit tests for is_meas_complete() We do not test is_meas_complete() individually yet, but it is an integral part of the measurement processings since this function decides where a measurement interval ends. - Add unit tests that test TCH/F, TCH/H, SDCCH/4 and STDCH/8 Change-Id: I8f89d9e7092cd65ba4d5c5649140692dcc20bdd6 Related: OS#2987 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 4 files changed, 184 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/10663/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 57eeef5..5c3def0 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -12,6 +12,8 @@ void lchan_meas_reset(struct gsm_lchan *lchan); +int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn); + bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn); #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index cb45e6e..2dc60d5 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -245,7 +245,7 @@ } /* determine if a measurement period ends at the given frame number */ -static int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn) +int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn) { unsigned int fn_mod = -1; const uint8_t *tbl; diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index ec89df9..0166771 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -484,6 +484,182 @@ OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); } +static void test_is_meas_complete_single(struct gsm_lchan *lchan, + uint32_t fn_end, uint8_t intv_len) +{ + unsigned int i; + unsigned int k; + int rc; + uint32_t offset; + + /* Walk through multiple measurement intervals and make sure that the + * interval end is detected only in the expected location */ + for (k = 0; k < 100; k++) { + offset = intv_len * k; + for (i = 0; i < intv_len; i++) { + rc = is_meas_complete(lchan, i + offset); + if (rc) + OSMO_ASSERT(i + offset == fn_end + offset); + } + } +} + +static void test_is_meas_complete(void) +{ + struct gsm_lchan *lchan; + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing is_meas_complete()\n"); + + /* Test interval end detection on TCH/F TS0-TS7 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 12, 104); + + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 25, 104); + + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 38, 104); + + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 51, 104); + + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 64, 104); + + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 77, 104); + + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 90, 104); + + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 103, 104); + + /* Test interval end detection on TCH/H TS0-TS7 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 12, 104); + + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 12, 104); + + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 25, 104); + + lchan = &trx->ts[1].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 25, 104); + + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 38, 104); + + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 38, 104); + + lchan = &trx->ts[2].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 51, 104); + + lchan = &trx->ts[3].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 51, 104); + + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 64, 104); + + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 64, 104); + + lchan = &trx->ts[4].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 77, 104); + + lchan = &trx->ts[5].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 77, 104); + + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 90, 104); + + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 90, 104); + + lchan = &trx->ts[6].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 103, 104); + + lchan = &trx->ts[7].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 103, 104); + + /* Test interval end detection on SDCCH/8 SS0-SS7 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 66, 102); + + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 70, 102); + + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 74, 102); + + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 78, 102); + + lchan = &trx->ts[0].lchan[4]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 98, 102); + + lchan = &trx->ts[0].lchan[5]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 0, 102); + + lchan = &trx->ts[0].lchan[6]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 4, 102); + + lchan = &trx->ts[0].lchan[7]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 8, 102); + + /* Test interval end detection on SDCCH/4 SS0-SS3 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 88, 102); + + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 92, 102); + + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 6, 102); + + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 10, 102); +} + /* This tests the robustness of lchan_meas_process_measurement(). This is the * function that is called from l1_sap.c each time a measurement indication is * received. The process must still go on when measurement indications (blocks) @@ -604,6 +780,7 @@ printf("***************************************************\n"); test_is_meas_overdue(); + test_is_meas_complete(); test_lchan_meas_process_measurement(false, false); test_lchan_meas_process_measurement(true, false); test_lchan_meas_process_measurement(false, true); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 77b652e..d8f8174 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -584,6 +584,10 @@ =========================================================== +Testing is_meas_complete() + + +=========================================================== Testing lchan_meas_process_measurement() (leaving out measurement sample for SACCH block) (leaving out measurement sample for SACCH block) -- To view, visit https://gerrit.osmocom.org/10663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8f89d9e7092cd65ba4d5c5649140692dcc20bdd6 Gerrit-Change-Number: 10663 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:07:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 17:07:33 +0000 Subject: Change in openbsc[master]: abis_nm_ipaccess_rsl_connect: Log bts and trx nr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10664 Change subject: abis_nm_ipaccess_rsl_connect: Log bts and trx nr ...................................................................... abis_nm_ipaccess_rsl_connect: Log bts and trx nr Back-port from osmo-bsc.git 24f2f55132f7230e387aef85612dcd6fc59cebe5. Change-Id: I134a3da3700381043bc93aed300ce4ec263e8698 --- M openbsc/src/libbsc/abis_nm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/64/10664/1 diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index cbb255a..922c2d5 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -2753,8 +2753,8 @@ if (ip == 0) attr_len -= 5; - DEBUGP(DNM, "ip.access RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", - inet_ntoa(ia), port, stream); + LOGP(DNM, LOGL_INFO, "(bts=%d,trx=%d) IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", + trx->bts->nr, trx->nr, inet_ntoa(ia), port, stream); return abis_nm_ipaccess_msg(trx->bts, NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, -- To view, visit https://gerrit.osmocom.org/10664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I134a3da3700381043bc93aed300ce4ec263e8698 Gerrit-Change-Number: 10664 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:07:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 17:07:33 +0000 Subject: Change in openbsc[master]: Fix heap-use-after-free due to OML link destruction Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10665 Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Fix heap-use-after-free due to OML link destruction Back-port from osmo-bsc.git 9862bcb5cdb9ece0acfdfb7c81e00c05fcd33ad3. ipaccess_drop_oml was being called inside an osmo_fd cb context, were -EBADF must be returned if the structure holding the osmo_fd is freed. In the middle of the path (see OS#3495 for path tree) it goes through a signal dispatch, so it's impossible to make sure we return some value to the osmo_fd cb. As a result, it is required to defer dropping the OML Link from current code path and do it through a timer. Fixes following ASan report: 20180822124927913 <0004> abis_nm.c:787 OC=RADIO-CARRIER(02) INST=(00,00,ff): CHANGE ADMINISTRATIVE STATE NACK CAUSE=Message cannot be performed 20180822124927913 <0004> osmo_bsc_main.c:186 Got CHANGE ADMINISTRATIVE STATE NACK going to drop the OML links. 20180822124927913 <0015> bts_ipaccess_nanobts.c:406 (bts=0) Dropping OML link. ... ================================================================= ==17607==ERROR: AddressSanitizer: heap-use-after-free on address 0x62e000060a68 at pc 0x7f5ea8e27086 bp 0x7ffde92b6d80 sp 0x7ffde92b6d78 READ of size 8 at 0x62e000060a68 thread T0 #0 0x7f5ea8e27085 in handle_ts1_write input/ipaccess.c:371 #1 0x7f5ea8e27085 in ipaccess_fd_cb input/ipaccess.c:391 #2 0x7f5ea9147ca8 in osmo_fd_disp_fds libosmocore/src/select.c:217 #3 0x7f5ea9147ca8 in osmo_select_main libosmocore/src/select.c:257 #4 0x555813ab79d6 in main osmo-bsc/osmo_bsc_main.c:922 #5 0x7f5ea76d02e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #6 0x555813ab84e9 in _start (/bin/osmo-bsc+0x34d4e9) Fixes: OS#3495 Change-Id: If9e73a3251547625a2372d58f1d8b87210d9f312 --- M openbsc/include/openbsc/gsm_data_shared.h M openbsc/include/openbsc/ipaccess.h M openbsc/src/libbsc/bsc_init.c M openbsc/src/libbsc/bts_ipaccess_nanobts.c 4 files changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/65/10665/1 diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index ddd5991..e616c12 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -723,6 +723,8 @@ struct gsm_e1_subslot oml_e1_link; uint8_t oml_tei; struct e1inp_sign_link *oml_link; + /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ + struct osmo_timer_list oml_drop_link_timer; /* when OML link was established */ time_t uptime; diff --git a/openbsc/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h index 82e89c2..1b5a485 100644 --- a/openbsc/include/openbsc/ipaccess.h +++ b/openbsc/include/openbsc/ipaccess.h @@ -29,6 +29,7 @@ } __attribute__((packed)); void ipaccess_drop_oml(struct gsm_bts *bts); +void ipaccess_drop_oml_deferred(struct gsm_bts *bts); void ipaccess_drop_rsl(struct gsm_bts_trx *trx); struct sdp_header_item { diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 21ed2e1..218b02a 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -65,7 +65,7 @@ } if (is_ipaccess_bts(nack->bts)) - ipaccess_drop_oml(nack->bts); + ipaccess_drop_oml_deferred(nack->bts); return 0; } diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index 64eb4f2..ea83767 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -157,7 +157,7 @@ enum abis_nm_chan_comb ccomb = abis_nm_chcomb4pchan(ts->pchan); if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - ipaccess_drop_oml(trx->bts); + ipaccess_drop_oml_deferred(trx->bts); return -1; } abis_nm_chg_adm_state(trx->bts, obj_class, @@ -360,6 +360,9 @@ struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; + /* First of all, remove deferred drop if enabled */ + osmo_timer_del(&bts->oml_drop_link_timer); + if (!bts->oml_link) return; @@ -389,6 +392,29 @@ } } +/*! Callback for \ref ipaccess_drop_oml_deferred_cb. + */ +static void ipaccess_drop_oml_deferred_cb(void *data) +{ + struct gsm_bts *bts = (struct gsm_bts *) data; + ipaccess_drop_oml(bts); +} +/*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in + * current code context. This may be needed if we want to destroy the OML link + * while being called from a lower layer "struct osmo_fd" cb, were it is + * mandatory to return -EBADF if the osmo_fd has been destroyed. In case code + * destroying an OML link is called through an osmo_signal, it becomes + * impossible to return any value, thus deferring the destruction is required. + */ +void ipaccess_drop_oml_deferred(struct gsm_bts *bts) +{ + if (!osmo_timer_pending(&bts->oml_drop_link_timer) && bts->oml_link) { + LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Deferring Drop of OML link.\n", bts->nr); + osmo_timer_setup(&bts->oml_drop_link_timer, ipaccess_drop_oml_deferred_cb, bts); + osmo_timer_schedule(&bts->oml_drop_link_timer, 0, 0); + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, -- To view, visit https://gerrit.osmocom.org/10665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If9e73a3251547625a2372d58f1d8b87210d9f312 Gerrit-Change-Number: 10665 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 17:08:21 +0000 Subject: Change in osmo-bts[master]: cosmetic: test_is_meas_overdue() does not test is_meas_complete() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10666 Change subject: cosmetic: test_is_meas_overdue() does not test is_meas_complete() ...................................................................... cosmetic: test_is_meas_overdue() does not test is_meas_complete() The function is_meas_overdue() does not use is_meas_complete() anymore and therefore the related log output is wrong. Lets correct this. Change-Id: I9b7aa2f7a7c75bc3eed0c94b6ef9d17e7e36ce96 Related: OS#2975 --- M tests/meas/meas_test.c M tests/meas/meas_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/10666/1 diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index d5900e9..e6c9920 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -127,7 +127,7 @@ printf("\n\n"); printf("===========================================================\n"); - printf("Testing is_meas_overdue() and is_meas_complete()\n"); + printf("Testing is_meas_overdue()\n"); /* Missing period-end-trigger at fn=12, TCH/F, TS0 */ fn_missed_end = LCHAN_FN_DUMMY; diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 77b652e..0598d58 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -580,7 +580,7 @@ =========================================================== -Testing is_meas_overdue() and is_meas_complete() +Testing is_meas_overdue() =========================================================== -- To view, visit https://gerrit.osmocom.org/10666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b7aa2f7a7c75bc3eed0c94b6ef9d17e7e36ce96 Gerrit-Change-Number: 10666 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:17:04 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Aug 2018 17:17:04 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/10651 ) Change subject: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64408b2095fb2aea24c0306673aa40279ea9f75f Gerrit-Change-Number: 10651 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 28 Aug 2018 17:17:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:17:16 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Aug 2018 17:17:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: don't re-use the same NS for all 3 BSSGP In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/10649 ) Change subject: sgsn: don't re-use the same NS for all 3 BSSGP ...................................................................... sgsn: don't re-use the same NS for all 3 BSSGP Create for every BSSGP a new NS instance. Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09 --- M sgsn/SGSN_Tests.default M sgsn/SGSN_Tests.ttcn 2 files changed, 27 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default index 82682e2..e44e234 100644 --- a/sgsn/SGSN_Tests.default +++ b/sgsn/SGSN_Tests.default @@ -20,12 +20,6 @@ [MODULE_PARAMETERS] -SGSN_Tests.mp_nsconfig := { - local_udp_port := 21000, - remote_udp_port := 23000, - nsvci := 97, - nsei := 96 -} Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSGSN"; [MAIN_CONTROLLER] diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 715bdcc..82c37f2 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -44,13 +44,31 @@ integer mp_hlr_port := 4222; charstring mp_ggsn_ip := "127.0.0.2"; - NSConfiguration mp_nsconfig := { - local_udp_port := 23000, - local_ip := "127.0.0.1", - remote_udp_port := 21000, - remote_ip := "127.0.0.1", - nsvci := 0, - nsei := 2342 + NSConfigurations mp_nsconfig := { + { + local_udp_port := 21010, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1", + nsvci := 97, + nsei := 96 + }, + { + local_udp_port := 21011, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1", + nsvci := 98, + nsei := 97 + }, + { + local_udp_port := 21012, + local_ip := "127.0.0.1", + remote_udp_port := 23000, + remote_ip := "127.0.0.1", + nsvci := 99, + nsei := 98 + } }; }; @@ -61,6 +79,7 @@ }; type record length(3) of GbInstance GbInstances; +type record length(3) of NSConfiguration NSConfigurations; type record length(3) of BssgpCellId BssgpCellIds; type component test_CT { @@ -135,7 +154,7 @@ /* connect lower end of NS emulation to NS codec port (on top of IPL4) */ map(gb.vc_NS:NSCP, system:NS_CODEC_PORT); - gb.vc_NS.start(NSStart(mp_nsconfig)); + gb.vc_NS.start(NSStart(mp_nsconfig[offset])); gb.vc_BSSGP.start(BssgpStart(gb.cfg)); } -- To view, visit https://gerrit.osmocom.org/10649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3448fe837eaa8efab65dccc32bacaaacd73a2f09 Gerrit-Change-Number: 10649 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:17:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 28 Aug 2018 17:17:39 +0000 Subject: Change in docker-playground[master]: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/10651 ) Change subject: ttcn3-sgsn-tests: synchronize module parameters with ttcn3 ...................................................................... ttcn3-sgsn-tests: synchronize module parameters with ttcn3 The module parameters changes in ttcn3 I3448fe837eaa8efab65dccc32bacaaacd73a2f09 Change-Id: I64408b2095fb2aea24c0306673aa40279ea9f75f --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved lynxis lazus: Verified diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index 92ed77b..5ad5f7d 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -13,8 +13,18 @@ [MODULE_PARAMETERS] SGSN_Tests.mp_nsconfig := { - local_ip := "172.18.8.103", - remote_ip := "172.18.8.10" + { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + }, + { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + }, + { + local_ip := "172.18.8.103", + remote_ip := "172.18.8.10" + } } SGSN_Tests.mp_hlr_ip := "172.18.8.103" SGSN_Tests.mp_ggsn_ip := "172.18.8.103" -- To view, visit https://gerrit.osmocom.org/10651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I64408b2095fb2aea24c0306673aa40279ea9f75f Gerrit-Change-Number: 10651 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:35:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 28 Aug 2018 17:35:39 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10667 Change subject: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code ...................................................................... osmo-bts-trx: Big refactor and cleanup of osmo-trx related code * This commit is a preparation for future commits to add support for different osmo-trx devices and backends like osmo-trx-lms. * Drop deprecated osmo-trx-* cmd line params and use VTY cfg to set them. * As number of osmo-trx related osmo-gsm-tester attributes grow, group them togther in an "osmo_trx" dictionary. Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 --- M example/defaults.conf M example/resources.conf.prod M example/resources.conf.rnd M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 8 files changed, 119 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/10667/1 diff --git a/example/defaults.conf b/example/defaults.conf index 5bdf257..fc4c324 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -75,3 +75,8 @@ - {} - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0. - phys_chan_config: TCH/F + +osmo_trx: + type: uhd + launch_trx: true + clock_reference: internal diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 31a737c..41ab009 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -24,16 +24,21 @@ ipa_unit_id: 6 addr: 10.42.42.50 band: GSM-1800 - launch_trx: true ciphers: [a5_0, a5_1] + osmo_trx: + launch_trx: true + clock_reference: external - label: sysmoCell 5000 type: osmo-bts-trx ipa_unit_id: 7 addr: 10.42.42.51 band: GSM-1800 - trx_remote_ip: 10.42.42.112 ciphers: [a5_0, a5_1] + osmo_trx: + launch_trx: false + clock_reference: external + trx_ip: 10.42.42.112 - label: OCTBTS 3500 type: osmo-bts-octphy diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 4e5c173..74b8e3e 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -24,7 +24,10 @@ ipa_unit_id: 6 addr: 10.42.42.50 band: GSM-1800 - launch_trx: true + osmo_trx: + type: uhd + launch_trx: true + clock_reference: external ciphers: [a5_0, a5_1] - label: NanoBTS-ONW-1900 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 1584eb2..1c7349f 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -20,6 +20,7 @@ import os import pprint import tempfile +from abc import ABCMeta, abstractmethod from . import log, config, util, template, process, pcu_osmo, bts_osmo from .event_loop import MainLoop @@ -39,17 +40,15 @@ self.inst = None self.trx = None self.env = {} + self.gen_conf = {} def trx_remote_ip(self): - conf_ip = self.conf.get('trx_remote_ip', None) + conf_ip = self.conf.get('osmo_trx', {}).get('trx_ip', None) if conf_ip is not None: return conf_ip # if 'trx_remote_ip' is not configured, use same IP as BTS return self.remote_addr() - def launch_trx_enabled(self): - return util.str2bool(self.conf.get('launch_trx')) - def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) @@ -69,17 +68,22 @@ self.dbg(config_file=self.config_file) values = dict(osmo_bts_trx=config.get_defaults('osmo_bts_trx')) + config.overlay(values, dict(osmo_bts_trx=dict(osmo_trx=config.get_defaults('osmo_trx')))) config.overlay(values, self.suite_run.config()) config.overlay(values, { 'osmo_bts_trx': { 'oml_remote_ip': self.bsc.addr(), - 'trx_local_ip': self.remote_addr(), - 'trx_remote_ip': self.trx_remote_ip(), 'pcu_socket_path': self.pcu_socket_path(), + 'osmo_trx': { + 'bts_ip': self.remote_addr(), + 'trx_ip': self.trx_remote_ip(), + 'channels': [{}] # TODO: implement channels for multiTRX + } } }) config.overlay(values, { 'osmo_bts_trx': self.conf }) + self.gen_conf = values self.dbg('OSMO-BTS-TRX CONFIG:\n' + pprint.pformat(values)) with open(self.config_file, 'w') as f: @@ -87,6 +91,12 @@ self.dbg(r) f.write(r) + def launch_trx_enabled(self): + return util.str2bool(self.gen_conf['osmo_bts_trx'].get('osmo_trx', {}).get('launch_trx')) + + def get_osmo_trx_type(self): + return self.gen_conf['osmo_bts_trx'].get('osmo_trx', {}).get('type') + ######################## # PUBLIC - INTERNAL API ######################## @@ -95,6 +105,9 @@ self.dbg(conf=values) return values + def conf_for_osmotrx(self): + return dict(osmo_trx=self.gen_conf['osmo_bts_trx'].get('osmo_trx', {})) + ################### # PUBLIC (test API included) ################### @@ -108,9 +121,9 @@ self.configure() if self.launch_trx_enabled(): - self.trx = OsmoTrx(self.suite_run, self.conf, self.trx_remote_ip(), self.remote_addr()) + self.trx = OsmoTrx.get_instance_by_type(self.get_osmo_trx_type(), self.suite_run, self.conf_for_osmotrx()) self.trx.start(keepalive) - self.log('Waiting for osmo-trx to start up...') + self.log('Waiting for %s to start up...' % self.trx.name()) MainLoop.wait(self, self.trx.trx_ready) self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bts'))) @@ -124,36 +137,42 @@ '-i', self.bsc.addr()) self.suite_run.poll() -class OsmoTrx(log.Origin): - suite_run = None - run_dir = None - inst = None - env = None - proc_trx = None +class OsmoTrx(log.Origin, metaclass=ABCMeta): - BIN_TRX = 'osmo-trx-uhd' CONF_OSMO_TRX = 'osmo-trx.cfg' - def __init__(self, suite_run, conf, listen_ip, bts_ip): - super().__init__(log.C_RUN, OsmoTrx.BIN_TRX) +############## +# PROTECTED +############## + def __init__(self, suite_run, conf): + super().__init__(log.C_RUN, self.binary_name()) self.suite_run = suite_run self.conf = conf self.env = {} - self.listen_ip = listen_ip - self.bts_ip = bts_ip + self.listen_ip = conf.get('trx_ip') + self.bts_ip = conf.get('bts_ip') + self.run_dir = None + self.inst = None + self.proc_trx = None + + @classmethod + def get_instance_by_type(cls, type, suite_run, conf): + KNOWN_OSMOTRX_TYPES = { + 'uhd': OsmoTrxUHD, + } + osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type) + return osmo_trx_class(suite_run, conf) + + @abstractmethod + def binary_name(self): + 'Used by base class. Subclass can create different OsmoTRX implementations.' + pass def configure(self): self.config_file = self.run_dir.new_file(OsmoTrx.CONF_OSMO_TRX) self.dbg(config_file=self.config_file) - values = dict(osmo_bts_trx=config.get_defaults('osmo_trx')) - config.overlay(values, self.suite_run.config()) - config.overlay(values, { - 'osmo_trx': { - 'bind_ip' : self.listen_ip, - } - }) - config.overlay(values, { 'osmo_trx': self.conf }) + values = self.conf self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values)) @@ -162,16 +181,6 @@ self.dbg(r) f.write(r) - def start(self, keepalive=False): - self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) - self.configure() - self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) - lib = self.inst.child('lib') - self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_trx = self.launch_process(keepalive, OsmoTrx.BIN_TRX, '-x', - '-j', self.listen_ip, '-i', self.bts_ip, - '-C', os.path.abspath(self.config_file)) - def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) @@ -184,8 +193,30 @@ proc.launch() return proc +############## +# PUBLIC (test API included) +############## + def start(self, keepalive=False): + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + self.configure() + self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) + lib = self.inst.child('lib') + self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + self.proc_trx = self.launch_process(keepalive, self.binary_name(), + '-C', os.path.abspath(self.config_file)) + def trx_ready(self): if not self.proc_trx or not self.proc_trx.is_running: return False return '-- Transceiver active with' in (self.proc_trx.get_stdout() or '') + +class OsmoTrxUHD(OsmoTrx): + BIN_TRX = 'osmo-trx-uhd' + + def __init__(self, suite_run, conf): + super().__init__(suite_run, conf) + + def binary_name(self): + return OsmoTrxUHD.BIN_TRX + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 15f2711..9ca5665 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -54,8 +54,6 @@ 'bts[].ipa_unit_id': schema.UINT, 'bts[].addr': schema.IPV4, 'bts[].band': schema.BAND, - 'bts[].trx_remote_ip': schema.IPV4, - 'bts[].launch_trx': schema.BOOL_STR, 'bts[].direct_pcu': schema.BOOL_STR, 'bts[].ciphers[]': schema.CIPHER, 'bts[].channel_allocator': schema.CHAN_ALLOCATOR, @@ -70,6 +68,10 @@ 'bts[].trx_list[].power_supply.type': schema.STR, 'bts[].trx_list[].power_supply.device': schema.STR, 'bts[].trx_list[].power_supply.port': schema.STR, + 'bts[].osmo_trx.launch_trx': schema.BOOL_STR, + 'bts[].osmo_trx.type': schema.STR, + 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, + 'bts[].osmo_trx.trx_ip': schema.IPV4, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, 'modem[].label': schema.STR, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 174c28f..12cfd7a 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -115,6 +115,11 @@ return raise ValueError('Unknown Codec value: %r' % val) +def osmo_trx_clock_ref(val): + if val in ('internal', 'external', 'gspdo'): + return + raise ValueError('Unknown OsmoTRX clock reference value: %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -132,6 +137,7 @@ PHY_CHAN = 'chan' CHAN_ALLOCATOR = 'chan_allocator' CODEC = 'codec' +OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref' SCHEMA_TYPES = { INT: int, @@ -151,6 +157,7 @@ PHY_CHAN: phy_channel_config, CHAN_ALLOCATOR: channel_allocator, CODEC: codec, + OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref, } def validate(config, schema): diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl index d95ca6e..5dba323 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -21,8 +21,8 @@ bind ${osmo_bts_trx.addr} ! phy 0 - osmotrx ip local ${osmo_bts_trx.trx_local_ip} - osmotrx ip remote ${osmo_bts_trx.trx_remote_ip} + osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip} + osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip} instance 0 osmotrx rx-gain 25 osmotrx tx-attenuation oml diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index a197c59..2f6e830 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -1,15 +1,34 @@ ! -! OsmoHLR example configuration +! OsmoTRX example configuration ! log stderr logging filter all 1 logging color 1 logging print category 1 logging timestamp 1 + logging print file basename logging print extended-timestamp 1 logging level all info ! line vty - bind ${osmo_trx.bind_ip} + bind ${osmo_trx.trx_ip} ctrl - bind ${osmo_trx.bind_ip} + bind ${osmo_trx.trx_ip} +trx + bind-ip ${osmo_trx.trx_ip} + remote-ip ${osmo_trx.bts_ip} + base-port 5700 + egprs disable + tx-sps 4 + rx-sps 4 + clock-ref ${osmo_trx.clock_reference} + rt-prio 18 +%for chan in osmo_trx.channels: + chan ${loop.index} +% if chan.get('tx_path', False): + tx-path ${chan.tx_path} +% endif +% if chan.get('rx_path', False): + rx-path ${chan.rx_path} + %endif +%endfor -- To view, visit https://gerrit.osmocom.org/10667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 Gerrit-Change-Number: 10667 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:44:04 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 28 Aug 2018 17:44:04 +0000 Subject: Change in simtrace2[master]: set main clock for using UART at 921600 bps Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10668 Change subject: set main clock for using UART at 921600 bps ...................................................................... set main clock for using UART at 921600 bps UART baud rate is main clock (MCK) divided by CR*16. The MCK values are chosen >= 48 MHz and <= 64 MHz to have a near integer value CR for a baud rate of 921600 bps. The end MCK frequency between simtrace and qmod differ slightly but are close to 58 MHz. Change-Id: Iaa4a97fc68494c93b9d128503515d88049de506c --- M firmware/libboard/common/include/board_common.h M firmware/libboard/common/source/board_lowlevel.c M firmware/libboard/owhw/include/board.h M firmware/libboard/qmod/include/board.h M firmware/libboard/simtrace/include/board.h 5 files changed, 31 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/68/10668/1 diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 1b29680..db030ad 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -53,8 +53,6 @@ /** Core definition */ #define cortexm3 -#define BOARD_MCK 48000000 - #define PIO_LED_RED PIO_PA17 #define PIO_LED_GREEN PIO_PA18 diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index b82f6f3..2be6134 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.c @@ -46,39 +46,39 @@ #define BOARD_OSCOUNT (CKGR_MOR_MOSCXTST(0x8)) #define BOARD_MCKR (PMC_MCKR_PRES_CLK | PMC_MCKR_CSS_PLLA_CLK) -#if (BOARD_MCK == 48000000) -#if (BOARD_MAINOSC == 18432000) -/* Clock settings at 48MHz for 18 MHz crystal */ -#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ - | CKGR_PLLAR_MULA(13-1) \ - | CKGR_PLLAR_PLLACOUNT(0x1) \ - | CKGR_PLLAR_DIVA(5)) -#elif (BOARD_MAINOSC == 12000000) -/* QMod has 12 MHz clock, so multply by 8 (96 MHz) and divide by 2 */ +/** configure PLL to generate main clock based on main oscillator frequency */ +#if (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 48000000) #define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ | CKGR_PLLAR_MULA(8-1) \ | CKGR_PLLAR_PLLACOUNT(0x1) \ | CKGR_PLLAR_DIVA(2)) -#else -#error "Please define PLLA config for your MAINOSC frequency" -#endif /* MAINOSC */ -#elif (BOARD_MCK == 64000000) -#if (BOARD_MAINOSC == 18432000) -/* Clock settings at 64MHz for 18 MHz crystal: 64.512 MHz */ +#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 58000000) #define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ - | CKGR_PLLAR_MULA(7-1) \ + | CKGR_PLLAR_MULA(29-1) \ | CKGR_PLLAR_PLLACOUNT(0x1) \ - | CKGR_PLLAR_DIVA(2)) -#elif (BOARD_MAINOSC == 12000000) -/* QMod has 12 MHz clock, so multply by 10 / div by 2: 60 MHz */ + | CKGR_PLLAR_DIVA(6)) +#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 60000000) #define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ | CKGR_PLLAR_MULA(10-1) \ | CKGR_PLLAR_PLLACOUNT(0x1) \ | CKGR_PLLAR_DIVA(2)) -#error "Please define PLLA config for your MAINOSC frequency" -#endif /* MAINOSC */ +#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 47923200) +#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ + | CKGR_PLLAR_MULA(13-1) \ + | CKGR_PLLAR_PLLACOUNT(0x1) \ + | CKGR_PLLAR_DIVA(5)) +#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 58982400) +#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ + | CKGR_PLLAR_MULA(16-1) \ + | CKGR_PLLAR_PLLACOUNT(0x1) \ + | CKGR_PLLAR_DIVA(5)) +#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 64512000) +#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ + | CKGR_PLLAR_MULA(7-1) \ + | CKGR_PLLAR_PLLACOUNT(0x1) \ + | CKGR_PLLAR_DIVA(2)) #else - #error "No PLL settings for current BOARD_MCK." + #error "Please define PLLA config for your BOARD_MCK/MAINOSC frequency" #endif #if (BOARD_MAINOSC == 12000000) diff --git a/firmware/libboard/owhw/include/board.h b/firmware/libboard/owhw/include/board.h index be6bb17..401fb73 100644 --- a/firmware/libboard/owhw/include/board.h +++ b/firmware/libboard/owhw/include/board.h @@ -25,7 +25,10 @@ /** Board definition */ #define owhw +/** oscillator used as main clock source (in Hz) */ #define BOARD_MAINOSC 18432000 +/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ +#define BOARD_MCK 58982400 // 18.432 * 16 / 5 /* USIM 2 interface (USART) */ #define PIN_USIM2_CLK {PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT} diff --git a/firmware/libboard/qmod/include/board.h b/firmware/libboard/qmod/include/board.h index c23ad50..a738daa 100644 --- a/firmware/libboard/qmod/include/board.h +++ b/firmware/libboard/qmod/include/board.h @@ -28,7 +28,10 @@ /** Board definition */ #define qmod +/** oscillator used as main clock source (in Hz) */ #define BOARD_MAINOSC 12000000 +/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ +#define BOARD_MCK 58000000 // 18.432 * 29 / 6 /* USIM 2 interface (USART) */ #define PIN_USIM2_CLK {PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT} diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index 6751863..0c1e533 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -26,8 +26,10 @@ /* Board definition */ #define simtrace -/* Board main oscillator frequency (in Hz) */ +/** oscillator used as main clock source (in Hz) */ #define BOARD_MAINOSC 18432000 +/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ +#define BOARD_MCK 58982400 // 18.432 * 16 / 5 /** Pin configuration **/ /* Button to force bootloader start (shorted to ground when pressed */ -- To view, visit https://gerrit.osmocom.org/10668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa4a97fc68494c93b9d128503515d88049de506c Gerrit-Change-Number: 10668 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:44:05 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 28 Aug 2018 17:44:05 +0000 Subject: Change in simtrace2[master]: UART: switch baud rate to 921600 bps Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10669 Change subject: UART: switch baud rate to 921600 bps ...................................................................... UART: switch baud rate to 921600 bps the higher baud rate allows for more debugging (without dropping data) and is well supported by USB for UART adapters (this standard baud rate is 8 x 115200). the closest matching integer value is calculated for UART CR. no floating point calculation can be used since this would increase the size of the resulting binary by ~ 2kB (for the softfp). this is not possible for the DFU since it already is close to the maximum size of 16 kB. Change-Id: I82b74f697342d580ccb79ada4715f35f4e8cca86 --- M firmware/libboard/common/include/board_common.h M firmware/libboard/common/source/uart_console.c 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/69/10669/1 diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index db030ad..1155158 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -77,8 +77,8 @@ #define PINS_UART { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT} /** UART0 */ -/** Console baudrate always using 115200. */ -#define CONSOLE_BAUDRATE 115200 +/** Console baud rate in bps */ +#define CONSOLE_BAUDRATE 921600 /** UART peripheral used by the console (UART0). */ #define CONSOLE_UART UART0 /** UART peripheral ID used by the console (UART0). */ diff --git a/firmware/libboard/common/source/uart_console.c b/firmware/libboard/common/source/uart_console.c index 3a00e49..bcfb0b7 100644 --- a/firmware/libboard/common/source/uart_console.c +++ b/firmware/libboard/common/source/uart_console.c @@ -85,7 +85,12 @@ /* Configure baudrate */ /* Asynchronous, no oversampling */ - pUart->UART_BRGR = (masterClock / baudrate) / 16; + //pUart->UART_BRGR = (masterClock / baudrate) / 16; + if ((masterClock / baudrate) % 16 >= 7) { + pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 1; + } else { + pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 0; + } /* Disable PDC channel */ pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS; -- To view, visit https://gerrit.osmocom.org/10669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82b74f697342d580ccb79ada4715f35f4e8cca86 Gerrit-Change-Number: 10669 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:44:05 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 28 Aug 2018 17:44:05 +0000 Subject: Change in simtrace2[master]: stdio: add void 'l' format string qualifier Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10670 Change subject: stdio: add void 'l' format string qualifier ...................................................................... stdio: add void 'l' format string qualifier Wformat requires uint32_t to be used in format string with the 'l' qualifier (l = long = at least 32 bits). this qualifier was not handled before. since on ARM 32-bit int == long we can simply ignore it (stdio already does not support 64-bit data). Change-Id: Ib506a66f68712c6b3eeb5129a39abf47ec86a2a7 --- M firmware/libcommon/source/stdio.c 1 file changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/70/10670/1 diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index 04d73f0..2bfaed7 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -350,19 +350,22 @@ } // Parse type - switch (*pFormat) { - case 'd': - case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break; - case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break; - case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break; - case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break; - case 's': num = PutString(pStr, va_arg(ap, char *)); break; - case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break; - default: - return EOF; - } - - pFormat++; + do { + num = 0; + switch (*pFormat) { + case 'l': num = -1; break; // ignore long qualifier since int == long (and long long is not supported) + case 'd': + case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break; + case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break; + case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break; + case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break; + case 's': num = PutString(pStr, va_arg(ap, char *)); break; + case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break; + default: + return EOF; + } + pFormat++; + } while (num < 0); pStr += num; size += num; } -- To view, visit https://gerrit.osmocom.org/10670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib506a66f68712c6b3eeb5129a39abf47ec86a2a7 Gerrit-Change-Number: 10670 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:44:06 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 28 Aug 2018 17:44:06 +0000 Subject: Change in simtrace2[master]: stdio: fix detection of malformated format strings Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10671 Change subject: stdio: fix detection of malformated format strings ...................................................................... stdio: fix detection of malformated format strings the error code returned by vsnprintf was ignored, resulting in printing the string from a previous print. Change-Id: I8506b05d56da55d1357a1234917adf341b46e1db --- M firmware/libcommon/source/stdio.c 1 file changed, 21 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/71/10671/1 diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index 2bfaed7..78517de 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -401,6 +401,9 @@ va_start(ap, pFormat); rc = vsnprintf(pString, length, pFormat, ap); + if (rc < 0) { // format string error + return rc; + } va_end(ap); return rc; @@ -429,12 +432,17 @@ signed int vfprintf(FILE *pStream, const char *pFormat, va_list ap) { char pStr[MAX_STRING_SIZE]; - char pError[] = "stdio.c: increase MAX_STRING_SIZE\n\r"; // Write formatted string in buffer - if (vsprintf(pStr, pFormat, ap) >= MAX_STRING_SIZE) { - - fputs(pError, stderr); + int rc = vsprintf(pStr, pFormat, ap); + if (rc < 0) { + fputs("format string error in ", stderr); + fputs(pFormat, stderr); + return rc; + } + if (rc >= MAX_STRING_SIZE) { + fputs("stdio.c: increase MAX_STRING_SIZE\n\r", stderr); + return rc; } // Display string @@ -454,12 +462,17 @@ signed int vfprintf_sync(FILE *pStream, const char *pFormat, va_list ap) { char pStr[MAX_STRING_SIZE]; - char pError[] = "stdio.c: increase MAX_STRING_SIZE\n\r"; // Write formatted string in buffer - if (vsprintf(pStr, pFormat, ap) >= MAX_STRING_SIZE) { - - fputs_sync(pError, stderr); + int rc = vsprintf(pStr, pFormat, ap); + if (rc < 0) { + fputs_sync("format string error in ", stderr); + fputs_sync(pFormat, stderr); + return rc; + } + if (rc >= MAX_STRING_SIZE) { + fputs_sync("stdio.c: increase MAX_STRING_SIZE\n\r", stderr); + return rc; } // Display string -- To view, visit https://gerrit.osmocom.org/10671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8506b05d56da55d1357a1234917adf341b46e1db Gerrit-Change-Number: 10671 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:44:07 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 28 Aug 2018 17:44:07 +0000 Subject: Change in simtrace2[master]: DFU: fix Wformat compile warning Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10672 Change subject: DFU: fix Wformat compile warning ...................................................................... DFU: fix Wformat compile warning Change-Id: I8c422d8a709f8311c40d37e1f1f01dcd3a199b6f --- M firmware/apps/dfu/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/72/10672/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 7f8fbfc..f9b6aed 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -256,7 +256,7 @@ TRACE_INFO("Serial Nr. %08x-%08x-%08x-%08x\n\r", g_unique_id[0], g_unique_id[1], g_unique_id[2], g_unique_id[3]); - TRACE_INFO("Reset Cause: 0x%x\n\r", reset_cause); + TRACE_INFO("Reset Cause: 0x%lx\n\r", reset_cause); #if (TRACE_LEVEL >= TRACE_LEVEL_INFO) /* Find out why we are in the DFU bootloader, and not the main application */ -- To view, visit https://gerrit.osmocom.org/10672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8c422d8a709f8311c40d37e1f1f01dcd3a199b6f Gerrit-Change-Number: 10672 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 17:44:07 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Tue, 28 Aug 2018 17:44:07 +0000 Subject: Change in simtrace2[master]: qmod: output EEPROM data only on debug level, and add completion output Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/10673 Change subject: qmod: output EEPROM data only on debug level, and add completion output ...................................................................... qmod: output EEPROM data only on debug level, and add completion output the EEPROM byte output was causing data loss on the serial output, resulting is automatic tests failing. instead an end text will be output to detect the end of the procedure. Change-Id: Ib8d3cbd01d0e34432d424355f4fafb24bc5273a1 --- M firmware/libboard/qmod/source/board_qmod.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/73/10673/1 diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c index f04bc12..55efb54 100644 --- a/firmware/libboard/qmod/source/board_qmod.c +++ b/firmware/libboard/qmod/source/board_qmod.c @@ -90,11 +90,12 @@ TRACE_INFO("Verifying EEPROM...\n\r"); for (i = 0; i < ARRAY_SIZE(__eeprom_bin); i++) { int byte = eeprom_read_byte(0x50, i); - TRACE_INFO("0x%02x: %02x\n\r", i, byte); + TRACE_DEBUG("0x%02x: %02x\n\r", i, byte); if (byte != __eeprom_bin[i]) TRACE_ERROR("Byte %u is wrong, expected 0x%02x, found 0x%02x\n\r", i, __eeprom_bin[i], byte); } + TRACE_INFO("EEPROM written\n\r"); /* FIXME: Release PIN_PRTPWR_OVERRIDE after we know the hub is * again powering us up */ @@ -119,6 +120,7 @@ return 1; } } + TRACE_INFO("EEPROM erased\n\r"); return 0; } @@ -163,13 +165,13 @@ UART_GetIntegerMinMax(&addr, 0, 255); printf("Please enter EEPROM value:\n\r"); UART_GetIntegerMinMax(&val, 0, 255); - printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr); + printf("Writing value 0x%02x to EEPROM offset 0x%02x\n\r", val, addr); eeprom_write_byte(0x50, addr, val); break; case 'r': printf("Please enter EEPROM offset:\n\r"); UART_GetIntegerMinMax(&addr, 0, 255); - printf("EEPROM[0x%02lx] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr)); + printf("EEPROM[0x%02x] = 0x%02x\n\r", addr, eeprom_read_byte(0x50, addr)); break; default: printf("Unknown command '%c'\n\r", ch); -- To view, visit https://gerrit.osmocom.org/10673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8d3cbd01d0e34432d424355f4fafb24bc5273a1 Gerrit-Change-Number: 10673 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 18:53:56 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 28 Aug 2018 18:53:56 +0000 Subject: Change in osmo-bts[master]: measurement: add unit tests for is_meas_complete() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10663 to look at the new patch set (#2). Change subject: measurement: add unit tests for is_meas_complete() ...................................................................... measurement: add unit tests for is_meas_complete() We do not test is_meas_complete() individually yet, but it is an integral part of the measurement processings since this function decides where a measurement interval ends. - Add unit tests that test TCH/F, TCH/H, SDCCH/4 and STDCH/8 Change-Id: I8f89d9e7092cd65ba4d5c5649140692dcc20bdd6 Related: OS#2987 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 4 files changed, 187 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/10663/2 -- To view, visit https://gerrit.osmocom.org/10663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8f89d9e7092cd65ba4d5c5649140692dcc20bdd6 Gerrit-Change-Number: 10663 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:38:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:38:22 +0000 Subject: Change in osmo-mgw[master]: X-Osmo-IGN: rather parse items by token, not char In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10619 ) Change subject: X-Osmo-IGN: rather parse items by token, not char ...................................................................... X-Osmo-IGN: rather parse items by token, not char Adjust the X-Osmo-IGN parsing to use string tokens instead of parsing single characters. Reconsidering the first implementation as a poor choice, rather specify the format of X-Osmo-IGN as any-length string tokens separated by spaces, which is more flexible and more future proof. See also osmo-gsm-manuals If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 which defines the X-Osmo-IGN format as string tokens, matching this patch. In mgcp_test, add an unknown X-Osmo-IGN item. Though the output is not checked by the testsuite.at, running manually shows the error log about the unkown X-Osmo-IGN item. Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c --- M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 28 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index cb2c965..7f4a7b8 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -674,6 +674,30 @@ return 534; } +static bool parse_x_osmo_ign(struct mgcp_endpoint *endp, char *line) +{ + char *saveptr = NULL; + + if (strncmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) + return false; + line += strlen(MGCP_X_OSMO_IGN_HEADER); + + while (1) { + char *token = strtok_r(line, " ", &saveptr); + line = NULL; + if (!token) + break; + + if (!strcmp(token, "C")) + endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + else + LOGP(DLMGCP, LOGL_ERROR, "endpoint %x: received unknown X-Osmo-IGN item '%s'\n", + ENDPOINT_NUMBER(endp), token); + } + + return true; +} + /* CRCX command handler, processes the received command */ static struct msgb *handle_create_con(struct mgcp_parse_data *p) { @@ -723,22 +747,9 @@ break; } - /* Parse X-Osmo-IGN header */ - if (!strncmp(line, MGCP_X_OSMO_IGN_HEADER, - strlen(MGCP_X_OSMO_IGN_HEADER))) { - int i; - int line_len = strlen(line); - for (i = strlen(MGCP_X_OSMO_IGN_HEADER); i < line_len; i++) { - switch (line[i]) { - case 'C': - endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; - break; - default: - break; - } - } + if (parse_x_osmo_ign(endp, line)) break; - } + /* Ignore unknown X-headers */ break; case '\0': diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2d1e28a..f8f701e 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -314,7 +314,7 @@ "M: recvonly\r\n" \ "C: 2\r\n" \ "L: p:20\r\n" \ - "X-Osmo-IGN: C\r\n" \ + "X-Osmo-IGN: C foo\r\n" \ "\r\n" \ "v=0\r\n" \ "c=IN IP4 123.12.12.123\r\n" \ diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index bdaf5d7..fcad85a 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -427,7 +427,7 @@ M: recvonly C: 2 L: p:20 -X-Osmo-IGN: C +X-Osmo-IGN: C foo v=0 c=IN IP4 123.12.12.123 -- To view, visit https://gerrit.osmocom.org/10619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c Gerrit-Change-Number: 10619 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:38:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:38:56 +0000 Subject: Change in osmo-bts[master]: fix ip.access dyn TS for osmo-bts-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10598 ) Change subject: fix ip.access dyn TS for osmo-bts-trx ...................................................................... fix ip.access dyn TS for osmo-bts-trx For enabling PDCH on a dynamic timeslot, PDTCH and PTCCH SAPIs shall be enabled. While osmo-bts-sysmo uses the lchan->type to determine which SAPIs to enable (see lchan_activate() in osmo-bts-sysmo/oml.c: sapis_for_lchan[lchan->type]), the osmo-bts-trx code instead relies on the chan_nr indicating RSL_CHAN_OSMO_PDCH = 0xc0 (see trx_sched_set_lchan() in common/scheduler.c and the PDTCH,PTCCH entries in trx_chan_desc[]). The 0xc0 cbits are a non-standard invention specifically used for only Osmocom style dyn TS, so the chan_nr for IPA style dyn TS will and should never include this cbits pattern. Hence gsm_lchan2chan_nr() correctly always returns the TCH/F equivalent chan_nr for IPA dyn TS. Because trx_chan_desc[] relies on the 0xc0 in the chan_nr to activate the PDTCH and PTCCH SAPIs, internally patch the 0xc0 cbits over the chan_nr in osmo-bts-trx/l1_if.c for channel de-/activation, iff lchan->type == PDTCH. This is technically a convoluted mix-up of the cbits usage. Nevertheless, it is the simplest way to make IPA dyn TS behave the same as Osmocom dyn TS in scheduler.c. Apparently, IPA style dyn TS have never worked for osmo-bts-trx before? Related: OS#3493 Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d --- M src/osmo-bts-trx/l1_if.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve; Verified Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index a8fb401..23fc196 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -562,6 +562,20 @@ " chan_nr 0x%02x\n", chan_nr); break; } + + /* trx_chan_desc[] in scheduler.c uses the RSL_CHAN_OSMO_PDCH cbits + * (0xc0) to indicate the need for PDTCH and PTCCH SAPI activation. + * However, 0xc0 is a cbits pattern exclusively used for Osmocom style + * dyn TS (a non-standard RSL Chan Activ mod); hence, for IPA style dyn + * TS, the chan_nr will never reflect 0xc0 and we would omit the + * PDTCH,PTTCH SAPIs. To properly de-/activate the PDTCH SAPIs in + * scheduler.c, make sure the 0xc0 cbits are set for de-/activating PDTCH + * lchans, i.e. both Osmocom and IPA style dyn TS. (For Osmocom style dyn + * TS, the chan_nr typically already reflects 0xc0, while it doesn't for + * IPA style.) */ + if (lchan->type == GSM_LCHAN_PDTCH) + chan_nr = RSL_CHAN_OSMO_PDCH | (chan_nr & ~RSL_CHAN_NR_MASK); + /* activate dedicated channel */ trx_sched_set_lchan(&l1h->l1s, chan_nr, LID_DEDIC, 1); /* activate associated channel */ -- To view, visit https://gerrit.osmocom.org/10598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0eed8a135f2ab7e7c0d15ad5c76430b7fe54df3d Gerrit-Change-Number: 10598 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:39:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:39:06 +0000 Subject: Change in osmo-bsc[master]: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10586 ) Change subject: MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default ...................................................................... MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default Use libosmo-mgcp-client's new X-Osmo-IGN header to indicate that CallIDs are allowed to mismatch. Add VTY commands 'msc' / 'mgw x-osmo-ign call-id' and 'no mgw x-osmo-ign' to switch this behavior explicitly. For SCCPlite MSCs, unless a specific config was issued, always send 'X-Osmo-IGN: C' by default, to ignore CallID mismatches. Depends: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 (osmo-mgw) Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 56 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 7ec3442..6ca0330 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -130,6 +130,9 @@ * BSSMAP RESET procedure */ struct osmo_fsm_inst *reset_fsm; } a; + + uint32_t x_osmo_ign; + bool x_osmo_ign_configured; }; /* diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 091af5e..93883af 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -29,6 +29,7 @@ #include #include #include +#include static struct osmo_fsm lchan_rtp_fsm; @@ -154,8 +155,11 @@ lchan->mgw_endpoint_ci_bts = mgw_endpoint_ci_add(mgwep, "to-BTS"); - if (lchan->conn) + if (lchan->conn) { crcx_info.call_id = lchan->conn->sccp.conn_id; + if (lchan->conn->sccp.msc) + crcx_info.x_osmo_ign = lchan->conn->sccp.msc->x_osmo_ign; + } crcx_info.ptime = 20; mgcp_pick_codec(&crcx_info, lchan, true); diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 7e5f5f6..96f0687 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -35,6 +35,7 @@ #include #include #include +#include /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ @@ -496,6 +497,15 @@ if (!msc->a.sccp) return -EINVAL; + /* In SCCPlite, the MSC side of the MGW endpoint is configured by the MSC. Since we have + * no way to figure out which CallID ('C:') the MSC will issue in its CRCX command, set + * an X-Osmo-IGN flag telling osmo-mgw to ignore CallID mismatches for this endpoint. + * If an explicit VTY command has already indicated whether or not to send X-Osmo-IGN, do + * not overwrite that setting. */ + if (msc->a.asp_proto == OSMO_SS7_ASP_PROT_IPA + && !msc->x_osmo_ign_configured) + msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + /* If unset, use default local SCCP address */ if (!msc->a.bsc_addr.presence) osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp, diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index efa12e0..f90ad6f 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -191,6 +191,13 @@ /* write MGW configuration */ mgcp_client_config_write(vty, " "); + + if (msc->x_osmo_ign_configured) { + if (!msc->x_osmo_ign) + vty_out(vty, " no mgw x-osmo-ign%s", VTY_NEWLINE); + else + vty_out(vty, " mgw x-osmo-ign call-id%s", VTY_NEWLINE); + } } static int config_write_msc(struct vty *vty) @@ -672,6 +679,35 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_mgw_x_osmo_ign, + cfg_msc_mgw_x_osmo_ign_cmd, + "mgw x-osmo-ign call-id", + MGCP_CLIENT_MGW_STR + "Set a (non-standard) X-Osmo-IGN header in all CRCX messages for RTP streams" + " associated with this MSC, useful for A/SCCPlite MSCs, since osmo-bsc cannot know" + " the MSC's chosen CallID. This is enabled by default for A/SCCPlite connections," + " disabled by default for all others.\n" + "Send 'X-Osmo-IGN: C' to ignore CallID mismatches. See OsmoMGW.\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + msc->x_osmo_ign_configured = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_msc_no_mgw_x_osmo_ign, + cfg_msc_no_mgw_x_osmo_ign_cmd, + "no mgw x-osmo-ign", + NO_STR + MGCP_CLIENT_MGW_STR + "Do not send X-Osmo-IGN MGCP header to this MSC\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + msc->x_osmo_ign = 0; + msc->x_osmo_ign_configured = true; + return CMD_SUCCESS; +} + DEFUN(cfg_net_bsc_mid_call_text, cfg_net_bsc_mid_call_text_cmd, "mid-call-text .TEXT", @@ -983,6 +1019,8 @@ install_element(CFG_LOG_NODE, &logging_fltr_imsi_cmd); mgcp_client_vty_init(net, MSC_NODE, net->mgw.conf); + install_element(MSC_NODE, &cfg_msc_mgw_x_osmo_ign_cmd); + install_element(MSC_NODE, &cfg_msc_no_mgw_x_osmo_ign_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/10586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe Gerrit-Change-Number: 10586 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:40:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:40:57 +0000 Subject: Change in libosmocore[master]: log: add 'last' option to 'logging print file' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10631 ) Change subject: log: add 'last' option to 'logging print file' ...................................................................... log: add 'last' option to 'logging print file' Allow printing the source file information *after* the log information. Add target->print_filename_pos, log_set_print_filename_pos() and enum log_filename_pos, and the optional 'last' keyword to the 'logging print file' vty command. (An enum in case we want to add other positions later.) Rationale: on log lines, the logging context is usually printed first in the logging text. Without the source file information, this logging context pretty much aligns in an easily readable way. When adding the source file information, each line's logging context info is shifted right by a pretty much random amount and it is hard to spot recurring logging contexts. One solution is to switch off source file info, of course, but that's not an option when actively hacking on bugs and new features. For example, it is unnecessarily hard to spot lchan FSM related log lines in this osmo-bsc log snippet: DRSL NOTICE mgw_endpoint_fsm.c:603 mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Freeing instance DRSL NOTICE fsm.c:381 mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Deallocated DMSC NOTICE mgw_endpoint_fsm.c:603 SUBSCR_CONN(conn0){CLEARING}: Received Event FORGET_MGW_ENDPOINT DCHAN DEBUG lchan_rtp_fsm.c:741 lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED DCHAN DEBUG lchan_rtp_fsm.c:520 lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Freeing instance DCHAN DEBUG fsm.c:381 lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Deallocated DCHAN DEBUG lchan_rtp_fsm.c:520 lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED DCHAN DEBUG lchan_fsm.c:1232 lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: state_chg to WAIT_RF_RELEASE_ACK DRSL NOTICE handover_fsm.c:762 handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Terminating (cause = OSMO_FSM_TERM_REGULAR) DRSL NOTICE handover_fsm.c:762 handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Freeing instance DRSL NOTICE fsm.c:381 handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Deallocated DCHAN DEBUG lchan_fsm.c:1196 lchan(0-0-1-TCH_F-0){WAIT_RF_RELEASE_ACK}: state_chg to BORKEN DCHAN DEBUG lchan_fsm.c:354 lchan(0-0-1-TCH_F-0){BORKEN}: (type=TCH_F) Clearing lchan state DLMGCP DEBUG mgcp_client.c:741 Tx MGCP msg to MGCP GW: 'DLCX 3 2 at mgw MGCP 1.0' DLMGCP DEBUG mgcp_client.c:743 Sending msg to MGCP GW size: 66 DRLL NOTICE mgcp_client_fsm.c:422 MGCP_CONN(to-BTS){ST_DLCX_RESP}: Received Event EV_DLCX_RESP Placing the source file info behind the log text makes it much easier to follow, while the source file info is still available: DRSL NOTICE mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Freeing instance (mgw_endpoint_fsm.c:603) DRSL NOTICE mgw-endpoint(conn0){WAIT_MGW_RESPONSE}: Deallocated (fsm.c:381) DMSC NOTICE SUBSCR_CONN(conn0){CLEARING}: Received Event FORGET_MGW_ENDPOINT (mgw_endpoint_fsm.c:603) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED (lchan_rtp_fsm.c:741) DCHAN DEBUG lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Freeing instance (lchan_rtp_fsm.c:520) DCHAN DEBUG lchan_rtp(0-0-1-TCH_F-0){ROLLBACK}: Deallocated (fsm.c:381) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: Received Event LCHAN_EV_RTP_RELEASED (lchan_rtp_fsm.c:520) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RLL_RTP_ESTABLISH}: state_chg to WAIT_RF_RELEASE_ACK (lchan_fsm.c:1232) DRSL NOTICE handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Terminating (cause = OSMO_FSM_TERM_REGULAR) (handover_fsm.c:745) DRSL NOTICE handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Freeing instance (handover_fsm.c:745) DRSL NOTICE handover(interBSCin_conn0){WAIT_RR_HO_DETECT}: Deallocated (fsm.c:381) DCHAN DEBUG lchan(0-0-1-TCH_F-0){WAIT_RF_RELEASE_ACK}: state_chg to BORKEN (lchan_fsm.c:1196) DCHAN DEBUG lchan(0-0-1-TCH_F-0){BORKEN}: (type=TCH_F) Clearing lchan state (lchan_fsm.c:354) DLMGCP DEBUG Tx MGCP msg to MGCP GW: 'DLCX 3 12 at mgw MGCP 1.0' (mgcp_client.c:741) DLMGCP DEBUG Sending msg to MGCP GW size: 67 (mgcp_client.c:743) DRLL NOTICE MGCP_CONN(to-BTS){ST_DLCX_RESP}: Received Event EV_DLCX_RESP (mgcp_client_fsm.c:422) Implementation: for 'last', insert source file info only when an '\n' is found at the end of the log line composition buffer, so that LOGP()...LOGPC() constructs also print source file info only when a log line actually ends. Change-Id: I393907b3c9e0cc1145e102328adad0a83ee13a9f --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c 3 files changed, 71 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 3cae63d..8464043 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -228,6 +228,12 @@ LOG_FILENAME_BASENAME, }; +/*! Where on a log line source file and line should be logged. */ +enum log_filename_pos { + LOG_FILENAME_POS_HEADER_END, + LOG_FILENAME_POS_LINE_END, +}; + /*! structure representing a logging target */ struct log_target { struct llist_head entry; /*!< linked list */ @@ -313,6 +319,8 @@ bool print_category_hex; /* Should we print the source file and line, and in which way? */ enum log_filename_type print_filename2; + /* Where on a log line to put the source file info. */ + enum log_filename_pos print_filename_pos; }; /* use the above macros */ @@ -335,6 +343,7 @@ void log_set_print_timestamp(struct log_target *target, int); void log_set_print_filename(struct log_target *target, int); void log_set_print_filename2(struct log_target *target, enum log_filename_type lft); +void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos); void log_set_print_category(struct log_target *target, int); void log_set_print_category_hex(struct log_target *target, int); void log_set_print_level(struct log_target *target, int); diff --git a/src/logging.c b/src/logging.c index edb2b56..de0f2b0 100644 --- a/src/logging.c +++ b/src/logging.c @@ -406,21 +406,24 @@ goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); } - switch (target->print_filename2) { - case LOG_FILENAME_NONE: - break; - case LOG_FILENAME_PATH: - ret = snprintf(buf + offset, rem, "%s:%d ", file, line); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - break; - case LOG_FILENAME_BASENAME: - ret = snprintf(buf + offset, rem, "%s:%d ", const_basename(file), line); - if (ret < 0) - goto err; - OSMO_SNPRINTF_RET(ret, rem, offset, len); - break; + + if (target->print_filename_pos == LOG_FILENAME_POS_HEADER_END) { + switch (target->print_filename2) { + case LOG_FILENAME_NONE: + break; + case LOG_FILENAME_PATH: + ret = snprintf(buf + offset, rem, "%s:%d ", file, line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + case LOG_FILENAME_BASENAME: + ret = snprintf(buf + offset, rem, "%s:%d ", const_basename(file), line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + } } } ret = vsnprintf(buf + offset, rem, format, ap); @@ -428,6 +431,31 @@ goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); + /* For LOG_FILENAME_POS_LAST, print the source file info only when the caller ended the log + * message in '\n'. If so, nip the last '\n' away, insert the source file info and re-append an + * '\n'. All this to allow LOGP("start..."); LOGPC("...end\n") constructs. */ + if (target->print_filename_pos == LOG_FILENAME_POS_LINE_END + && offset > 0 && buf[offset-1] == '\n') { + switch (target->print_filename2) { + case LOG_FILENAME_NONE: + break; + case LOG_FILENAME_PATH: + offset --; + ret = snprintf(buf + offset, rem, " (%s:%d)\n", file, line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + case LOG_FILENAME_BASENAME: + offset --; + ret = snprintf(buf + offset, rem, " (%s:%d)\n", const_basename(file), line); + if (ret < 0) + goto err; + OSMO_SNPRINTF_RET(ret, rem, offset, len); + break; + } + } + if (target->use_color) { ret = snprintf(buf + offset, rem, "\033[0;m"); if (ret < 0) @@ -677,6 +705,17 @@ target->print_filename2 = lft; } +/*! Set the position where on a log line the source file info should be logged. + * \param[in] target Log target to be affected. + * \param[in] pos A LOG_FILENAME_POS_* enum value. + * LOG_FILENAME_POS_DEFAULT logs just before the caller supplied log message. + * LOG_FILENAME_POS_LAST logs only at the end of a log line, where the caller issued an '\n' to end the + */ +void log_set_print_filename_pos(struct log_target *target, enum log_filename_pos pos) +{ + target->print_filename_pos = pos; +} + /*! Enable or disable printing of the category name * \param[in] target Log target to be affected * \param[in] print_catname Enable (1) or disable (0) filenames diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 1194914..8c8a332 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -246,12 +246,14 @@ DEFUN(logging_prnt_file, logging_prnt_file_cmd, - "logging print file (0|1|basename)", + "logging print file (0|1|basename) [last]", LOGGING_STR "Log output settings\n" "Configure log message\n" "Don't prefix each log message\n" "Prefix each log message with the source file and line\n" - "Prefix each log message with the source file's basename (strip leading paths) and line\n") + "Prefix each log message with the source file's basename (strip leading paths) and line\n" + "Log source file info at the end of a log line. If omitted, log source file info just" + " before the log text.\n") { struct log_target *tgt = osmo_log_vty2tgt(vty); @@ -259,6 +261,10 @@ return CMD_WARNING; log_set_print_filename2(tgt, get_string_value(logging_print_file_args, argv[0])); + if (argc > 1) + log_set_print_filename_pos(tgt, LOG_FILENAME_POS_LINE_END); + else + log_set_print_filename_pos(tgt, LOG_FILENAME_POS_HEADER_END); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/10631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I393907b3c9e0cc1145e102328adad0a83ee13a9f Gerrit-Change-Number: 10631 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:41:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:41:07 +0000 Subject: Change in libosmocore[master]: gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10643 ) Change subject: gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 ...................................................................... gsm0808: inter-bsc HO messages: add missing BSSMAP header, x4 Change-Id: I9e128ba775227de5e4010f024338a78584f777ea --- M src/gsm/gsm0808.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index a90aa22..8c2d143 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -763,6 +763,9 @@ if (chosen_speech_version != 0) msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, chosen_speech_version); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } @@ -780,6 +783,9 @@ /* Message Type, 3.2.2.1 */ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_DETECT); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } @@ -816,6 +822,9 @@ if (params->lcls_bss_status_present) msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, params->lcls_bss_status); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } @@ -843,6 +852,9 @@ if (params->codec_list_bss_supported.len) gsm0808_enc_speech_codec_list(msg, ¶ms->codec_list_bss_supported); + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + return msg; } -- To view, visit https://gerrit.osmocom.org/10643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9e128ba775227de5e4010f024338a78584f777ea Gerrit-Change-Number: 10643 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:42:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:42:19 +0000 Subject: Change in osmo-bsc[master]: cosmetic: neighbor_ident_vty.c: add and use common string defs In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10632 ) Change subject: cosmetic: neighbor_ident_vty.c: add and use common string defs ...................................................................... cosmetic: neighbor_ident_vty.c: add and use common string defs The "bts", "lac" and "lac-ci" VTY parameters and documentation are used more than once in this file. Define once and re-use. Prepares cosmetically for a fix of the CI format in upcoming Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f. Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff --- M src/osmo-bsc/neighbor_ident_vty.c 1 file changed, 21 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index a38d123..993e0b4 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -74,6 +74,15 @@ #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add local or remote-BSS neighbor cell\n" #define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n" +#define LAC_PARAMS "lac <0-65535>" +#define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" + +#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>" +#define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" + +#define LOCAL_BTS_PARAMS "bts <0-255>" +#define LOCAL_BTS_DOC "Neighbor cell by local BTS number\n" "BTS number\n" + static struct gsm_bts *neighbor_ident_vty_parse_bts_nr(struct vty *vty, const char **argv) { const char *bts_nr_str = argv[0]; @@ -206,22 +215,22 @@ } DEFUN(cfg_neighbor_add_bts_nr, cfg_neighbor_add_bts_nr_cmd, - NEIGHBOR_ADD_CMD "bts <0-255>", - NEIGHBOR_ADD_DOC "Neighbor cell by local BTS number\n" "BTS number\n") + NEIGHBOR_ADD_CMD LOCAL_BTS_PARAMS, + NEIGHBOR_ADD_DOC LOCAL_BTS_DOC) { return add_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv)); } DEFUN(cfg_neighbor_add_lac, cfg_neighbor_add_lac_cmd, - NEIGHBOR_ADD_CMD "lac <0-65535>", - NEIGHBOR_ADD_DOC "Neighbor cell by LAC\n" "LAC\n") + NEIGHBOR_ADD_CMD LAC_PARAMS, + NEIGHBOR_ADD_DOC LAC_DOC) { return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac(vty, argv))); } DEFUN(cfg_neighbor_add_lac_ci, cfg_neighbor_add_lac_ci_cmd, - NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255>", - NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n") + NEIGHBOR_ADD_CMD LAC_CI_PARAMS, + NEIGHBOR_ADD_DOC LAC_CI_DOC) { return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv))); } @@ -344,8 +353,8 @@ } DEFUN(cfg_neighbor_add_lac_arfcn_bsic, cfg_neighbor_add_lac_arfcn_bsic_cmd, - NEIGHBOR_ADD_CMD "lac <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, - NEIGHBOR_ADD_DOC "Neighbor cell by lac\n" "lac\n" NEIGHBOR_IDENT_VTY_KEY_DOC) + NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_DOC LAC_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac(vty, argv); @@ -357,8 +366,8 @@ } DEFUN(cfg_neighbor_add_lac_ci_arfcn_bsic, cfg_neighbor_add_lac_ci_arfcn_bsic_cmd, - NEIGHBOR_ADD_CMD "lac-ci <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, - NEIGHBOR_ADD_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC) + NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_DOC LAC_CI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac_ci(vty, argv); @@ -383,8 +392,8 @@ } DEFUN(cfg_neighbor_del_bts_nr, cfg_neighbor_del_bts_nr_cmd, - NEIGHBOR_DEL_CMD "bts <0-255>", - NEIGHBOR_DEL_DOC "Neighbor cell by local BTS number\n" "BTS number\n") + NEIGHBOR_DEL_CMD LOCAL_BTS_PARAMS, + NEIGHBOR_DEL_DOC LOCAL_BTS_DOC) { return del_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv)); } -- To view, visit https://gerrit.osmocom.org/10632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I88a377c6d77c5f18877343f84f7a26f851a427ff Gerrit-Change-Number: 10632 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: continue despite missing Classmark In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10634 to look at the new patch set (#2). Change subject: inter-BSC HO incoming: continue despite missing Classmark ...................................................................... inter-BSC HO incoming: continue despite missing Classmark 3GPP mandates either Classmark Information 1 or 2 in BSSMAP Handover Request, but an SCCPlite MSC currently tested does not pass either of them. Make this missing IE a non-fatal error, continuing anyway should work out. See 3GPP TS 48.008, 3.2.1.8 HANDOVER REQUEST, where it says "Classmark Information 1 or Classmark Information 2" with note 6: "One of these two elements is sent." Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/10634/2 -- To view, visit https://gerrit.osmocom.org/10634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 Gerrit-Change-Number: 10634 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: drop old/wrong RTP port code In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10635 to look at the new patch set (#2). Change subject: inter-BSC HO incoming: drop old/wrong RTP port code ...................................................................... inter-BSC HO incoming: drop old/wrong RTP port code Drop nonsensical legacy code. The Circuit Identifier Code in A/SCCPlite does *not* indicate the RTP port to use. Rather, it indicates the MGW endpoint name to use when configuring the BSC's side of the MGW endpoint, and only the MGW will ever know the RTP port. Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed --- M src/osmo-bsc/handover_fsm.c 1 file changed, 0 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/35/10635/2 -- To view, visit https://gerrit.osmocom.org/10635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed Gerrit-Change-Number: 10635 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: lchan_fail_to(): store target state early In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10636 to look at the new patch set (#2). Change subject: lchan_fsm: lchan_fail_to(): store target state early ...................................................................... lchan_fsm: lchan_fail_to(): store target state early lchan_fail_to() is a macro to preserve useful source file:line information in logging. But a side effect is that its target state argument might evaluate differently at the end of the macro, if, say, the fi->state has changed. I hit such an instance on timeout of WAIT_RLL_RTP_ESTABLISH: lchan_fsm_timer_cb() calls macro lchan_fail(), which calls lchan_fail_to(lchan_fsm_on_error[fi->state]). Unlike for normal function invocation, this argument changes as fi->state changes. Since releasing the lchan_rtp_fsm already transitions the lchan fi into WAIT_RF_RELEASE_ACK, the final state change of lchan_fail_to() suddenly evaluates to the broken state instead of the intended WAIT_RF_RELEASE_ACK. Early in lchan_fail_to(), store the argument's value as of macro invocation. Change-Id: Id9bf4580a112ee5629f553a8bcb6b5b03b1c5f53 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/10636/2 -- To view, visit https://gerrit.osmocom.org/10636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id9bf4580a112ee5629f553a8bcb6b5b03b1c5f53 Gerrit-Change-Number: 10636 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan_fsm failure: log about state transitions In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10637 to look at the new patch set (#2). Change subject: cosmetic: lchan_fsm failure: log about state transitions ...................................................................... cosmetic: lchan_fsm failure: log about state transitions Early on during failure, log which state transition is intended after failure handling. If such state is already reached after failure handling, do not log "state transition not permitted", but rather skip the state change and log "Already in state X". Change-Id: I81f53b38637823e62860cb773b7573bb5c21fdb0 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/10637/2 -- To view, visit https://gerrit.osmocom.org/10637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I81f53b38637823e62860cb773b7573bb5c21fdb0 Gerrit-Change-Number: 10637 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: safer 'concluded' flag In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10638 to look at the new patch set (#2). Change subject: lchan_fsm: safer 'concluded' flag ...................................................................... lchan_fsm: safer 'concluded' flag The flag lchan->activate.concluded prevents entering the lchan_on_fully_established()/lchan_on_activation_failure() more than once. So far it was checked by callers, instead place in the functions themselves. There is a potential functional change here, since during lchan_fail(), the concluded flag was set only after entering lchan_on_activation_failure(). Now it is already set at the start and prevents multiple re-entry beyond doubt. This patch is not a result of an actual observed faulty behavior, just from reading the code and seeing the slight loophole. Change-Id: I0c906438b05442d66255203eb816453b7193a6d8 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/10638/2 -- To view, visit https://gerrit.osmocom.org/10638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0c906438b05442d66255203eb816453b7193a6d8 Gerrit-Change-Number: 10638 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: log: lchan_rtp_fsm: add missing '\n' In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10639 to look at the new patch set (#2). Change subject: log: lchan_rtp_fsm: add missing '\n' ...................................................................... log: lchan_rtp_fsm: add missing '\n' Change-Id: Ifa46295ef23cf3728bc946fe27b34f0607a24c9e --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/10639/2 -- To view, visit https://gerrit.osmocom.org/10639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifa46295ef23cf3728bc946fe27b34f0607a24c9e Gerrit-Change-Number: 10639 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: log: 'sending BSSMAP HO Request ACK' In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10640 to look at the new patch set (#2). Change subject: log: 'sending BSSMAP HO Request ACK' ...................................................................... log: 'sending BSSMAP HO Request ACK' Change-Id: Ie472c32861d9c9ca9ebec0221837030ffd83c73a --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/10640/2 -- To view, visit https://gerrit.osmocom.org/10640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie472c32861d9c9ca9ebec0221837030ffd83c73a Gerrit-Change-Number: 10640 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO: send failure msg directly In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10641 to look at the new patch set (#2). Change subject: inter-BSC HO: send failure msg directly ...................................................................... inter-BSC HO: send failure msg directly If inter-BSC HO failed, the conn is by definition not in an active state, and hence it makes no sense to verify the gscon FSM state before sending. Directly call osmo_bsc_sigtran_send(). Change-Id: Ic49c94462041800674fa961c4d19c0c045bfe0c0 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/10641/2 -- To view, visit https://gerrit.osmocom.org/10641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic49c94462041800674fa961c4d19c0c045bfe0c0 Gerrit-Change-Number: 10641 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Aug 28 19:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 28 Aug 2018 19:55:51 +0000 Subject: Change in osmo-bsc[master]: log: tweaks and more context in osmo_bsc_sigtran_send() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10642 to look at the new patch set (#2). Change subject: log: tweaks and more context in osmo_bsc_sigtran_send() ...................................................................... log: tweaks and more context in osmo_bsc_sigtran_send() Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/10642/2 -- To view, visit https://gerrit.osmocom.org/10642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b Gerrit-Change-Number: 10642 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Aug 28 20:19:04 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:19:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b85ae3ddd305_743f8466882869d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 133s] #include [ 133s] ^ [ 133s] compilation terminated. [ 133s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 133s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 133s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 133s] Makefile:407: recipe for target 'all-recursive' failed [ 133s] make[3]: *** [all-recursive] Error 1 [ 133s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 133s] Makefile:441: recipe for target 'all-recursive' failed [ 133s] make[2]: *** [all-recursive] Error 1 [ 133s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 133s] Makefile:373: recipe for target 'all' failed [ 133s] make[1]: *** [all] Error 2 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 133s] dh_auto_build: make -j1 returned exit code 2 [ 133s] debian/rules:45: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] obs-arm-6 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:18:49 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 136s] [ 117.510980] sysrq: SysRq : Power Off [ 136s] [ 117.536762] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] obs-arm-6 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:18:52 UTC 2018. [ 136s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:26:30 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:26:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b85afff85c5c_743f84668828831d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 83s] #include [ 83s] ^ [ 83s] compilation terminated. [ 83s] Makefile:614: recipe for target 'osmo_bsc_sigtran.o' failed [ 83s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 83s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 83s] Makefile:395: recipe for target 'all-recursive' failed [ 83s] make[3]: *** [all-recursive] Error 1 [ 83s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 83s] Makefile:429: recipe for target 'all-recursive' failed [ 83s] make[2]: *** [all-recursive] Error 1 [ 83s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 83s] Makefile:360: recipe for target 'all' failed [ 83s] make[1]: *** [all] Error 2 [ 83s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 83s] dh_auto_build: make -j1 returned exit code 2 [ 83s] debian/rules:45: recipe for target 'build' failed [ 83s] make: *** [build] Error 2 [ 83s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 83s] [ 83s] sheep81 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:26:15 UTC 2018. [ 83s] [ 83s] ### VM INTERACTION START ### [ 84s] Powering off. [ 84s] [ 76.981969] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] sheep81 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:26:16 UTC 2018. [ 84s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:26:47 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:26:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b85b01fd5163_743f84668828845a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 182s] #include [ 182s] ^ [ 182s] compilation terminated. [ 182s] Makefile:614: recipe for target 'osmo_bsc_sigtran.o' failed [ 182s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 182s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 182s] Makefile:395: recipe for target 'all-recursive' failed [ 182s] make[3]: *** [all-recursive] Error 1 [ 182s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 182s] Makefile:429: recipe for target 'all-recursive' failed [ 182s] make[2]: *** [all-recursive] Error 1 [ 182s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 182s] Makefile:360: recipe for target 'all' failed [ 182s] make[1]: *** [all] Error 2 [ 182s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 182s] dh_auto_build: make -j1 returned exit code 2 [ 182s] debian/rules:45: recipe for target 'build' failed [ 182s] make: *** [build] Error 2 [ 182s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 182s] [ 182s] cloud122 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:26:34 UTC 2018. [ 182s] [ 182s] ### VM INTERACTION START ### [ 183s] Powering off. [ 183s] [ 149.754052] reboot: Power down [ 185s] ### VM INTERACTION END ### [ 185s] [ 185s] cloud122 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:26:38 UTC 2018. [ 185s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:27:56 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:27:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b85b05bead23_743f8466882888c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 155s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o osmo_bsc_sigtran.o osmo_bsc_sigtran.c [ 155s] osmo_bsc_sigtran.c:38:38: fatal error: osmocom/mgcp/mgcp_common.h: No such file or directory [ 155s] compilation terminated. [ 155s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 155s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 155s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 155s] Makefile:407: recipe for target 'all-recursive' failed [ 155s] make[3]: *** [all-recursive] Error 1 [ 155s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 155s] Makefile:441: recipe for target 'all-recursive' failed [ 155s] make[2]: *** [all-recursive] Error 1 [ 155s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 155s] Makefile:373: recipe for target 'all' failed [ 155s] make[1]: *** [all] Error 2 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 155s] dh_auto_build: make -j1 returned exit code 2 [ 155s] debian/rules:45: recipe for target 'build' failed [ 155s] make: *** [build] Error 2 [ 155s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 155s] [ 155s] lamb03 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:27:43 UTC 2018. [ 155s] [ 155s] ### VM INTERACTION START ### [ 158s] [ 134.664478] sysrq: SysRq : Power Off [ 158s] [ 134.670140] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] lamb03 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:27:46 UTC 2018. [ 158s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:29:39 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:29:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b85b0b61ccf1_743f84668828894a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 89s] #include [ 89s] ^ [ 89s] compilation terminated. [ 89s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 89s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 89s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 89s] Makefile:407: recipe for target 'all-recursive' failed [ 89s] make[3]: *** [all-recursive] Error 1 [ 89s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 89s] Makefile:441: recipe for target 'all-recursive' failed [ 89s] make[2]: *** [all-recursive] Error 1 [ 89s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 89s] Makefile:373: recipe for target 'all' failed [ 89s] make[1]: *** [all] Error 2 [ 89s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 89s] dh_auto_build: make -j1 returned exit code 2 [ 89s] debian/rules:45: recipe for target 'build' failed [ 89s] make: *** [build] Error 2 [ 89s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 89s] [ 89s] build82 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:29:27 UTC 2018. [ 89s] [ 89s] ### VM INTERACTION START ### [ 92s] [ 81.701841] sysrq: SysRq : Power Off [ 93s] [ 81.793187] reboot: Power down [ 93s] ### VM INTERACTION END ### [ 93s] [ 93s] build82 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:29:32 UTC 2018. [ 93s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:30:47 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:30:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b85b10eba954_743f8466882892d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 86s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o osmo_bsc_sigtran.o osmo_bsc_sigtran.c [ 86s] osmo_bsc_sigtran.c:38:38: fatal error: osmocom/mgcp/mgcp_common.h: No such file or directory [ 86s] compilation terminated. [ 86s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 86s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 86s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 86s] Makefile:407: recipe for target 'all-recursive' failed [ 86s] make[3]: *** [all-recursive] Error 1 [ 86s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 86s] Makefile:441: recipe for target 'all-recursive' failed [ 86s] make[2]: *** [all-recursive] Error 1 [ 86s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 86s] Makefile:373: recipe for target 'all' failed [ 86s] make[1]: *** [all] Error 2 [ 86s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 86s] dh_auto_build: make -j1 returned exit code 2 [ 86s] debian/rules:45: recipe for target 'build' failed [ 86s] make: *** [build] Error 2 [ 86s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 86s] [ 86s] build75 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:30:29 UTC 2018. [ 86s] [ 86s] ### VM INTERACTION START ### [ 89s] [ 78.439380] sysrq: SysRq : Power Off [ 89s] [ 78.445368] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] build75 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:30:33 UTC 2018. [ 89s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:32:47 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:32:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/i586 In-Reply-To: References: Message-ID: <5b85b18b4ed53_743f846688289544@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 101s] #include [ 101s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 101s] compilation terminated. [ 101s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 101s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 101s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 101s] Makefile:407: recipe for target 'all-recursive' failed [ 101s] make[3]: *** [all-recursive] Error 1 [ 101s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 101s] Makefile:441: recipe for target 'all-recursive' failed [ 101s] make[2]: *** [all-recursive] Error 1 [ 101s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 101s] Makefile:373: recipe for target 'all' failed [ 101s] make[1]: *** [all] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 101s] dh_auto_build: make -j1 returned exit code 2 [ 101s] debian/rules:45: recipe for target 'build' failed [ 101s] make: *** [build] Error 2 [ 101s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 101s] [ 101s] sheep81 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:32:39 UTC 2018. [ 101s] [ 101s] ### VM INTERACTION START ### [ 104s] [ 96.137023] sysrq: SysRq : Power Off [ 104s] [ 96.142160] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] sheep81 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:32:43 UTC 2018. [ 104s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:34:30 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:34:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b85b1e07afc5_743f8466882897a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 101s] #include [ 101s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 101s] compilation terminated. [ 101s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 101s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 101s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 101s] Makefile:407: recipe for target 'all-recursive' failed [ 101s] make[3]: *** [all-recursive] Error 1 [ 101s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 101s] Makefile:441: recipe for target 'all-recursive' failed [ 101s] make[2]: *** [all-recursive] Error 1 [ 101s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 101s] Makefile:373: recipe for target 'all' failed [ 101s] make[1]: *** [all] Error 2 [ 101s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 101s] dh_auto_build: make -j1 returned exit code 2 [ 101s] debian/rules:45: recipe for target 'build' failed [ 101s] make: *** [build] Error 2 [ 101s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 101s] [ 101s] lamb11 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:34:16 UTC 2018. [ 101s] [ 101s] ### VM INTERACTION START ### [ 104s] [ 94.296361] sysrq: SysRq : Power Off [ 104s] [ 94.301734] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] lamb11 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:34:20 UTC 2018. [ 104s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:34:47 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:34:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b85b1ff4e98f_743f846688289859@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 123s] #include [ 123s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 123s] compilation terminated. [ 123s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 123s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 123s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 123s] Makefile:407: recipe for target 'all-recursive' failed [ 123s] make[3]: *** [all-recursive] Error 1 [ 123s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 123s] Makefile:441: recipe for target 'all-recursive' failed [ 123s] make[2]: *** [all-recursive] Error 1 [ 123s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 123s] Makefile:373: recipe for target 'all' failed [ 123s] make[1]: *** [all] Error 2 [ 123s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 123s] dh_auto_build: make -j1 returned exit code 2 [ 123s] debian/rules:45: recipe for target 'build' failed [ 123s] make: *** [build] Error 2 [ 123s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 123s] [ 123s] lamb10 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:34:42 UTC 2018. [ 123s] [ 123s] ### VM INTERACTION START ### [ 126s] [ 115.497795] sysrq: SysRq : Power Off [ 126s] [ 115.504990] reboot: Power down [ 126s] ### VM INTERACTION END ### [ 126s] [ 126s] lamb10 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:34:45 UTC 2018. [ 126s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:34:47 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:34:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b85b1ff985a5_743f846688289913@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 172s] #include [ 172s] ^ [ 172s] compilation terminated. [ 172s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 172s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 172s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 172s] Makefile:407: recipe for target 'all-recursive' failed [ 172s] make[3]: *** [all-recursive] Error 1 [ 172s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 172s] Makefile:441: recipe for target 'all-recursive' failed [ 172s] make[2]: *** [all-recursive] Error 1 [ 172s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 172s] Makefile:373: recipe for target 'all' failed [ 172s] make[1]: *** [all] Error 2 [ 172s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 172s] dh_auto_build: make -j1 returned exit code 2 [ 172s] debian/rules:45: recipe for target 'build' failed [ 172s] make: *** [build] Error 2 [ 172s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 172s] [ 172s] cloud117 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:34:27 UTC 2018. [ 172s] [ 172s] ### VM INTERACTION START ### [ 175s] [ 137.350793] sysrq: SysRq : Power Off [ 175s] [ 137.437274] reboot: Power down [ 176s] ### VM INTERACTION END ### [ 176s] [ 176s] cloud117 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:34:31 UTC 2018. [ 176s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue Aug 28 20:36:13 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 28 Aug 2018 20:36:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5b85b2591706c_743f846688290596@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_17.10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 215s] #include [ 215s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ [ 215s] compilation terminated. [ 215s] Makefile:625: recipe for target 'osmo_bsc_sigtran.o' failed [ 215s] make[4]: *** [osmo_bsc_sigtran.o] Error 1 [ 215s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 215s] Makefile:407: recipe for target 'all-recursive' failed [ 215s] make[3]: *** [all-recursive] Error 1 [ 215s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 215s] Makefile:441: recipe for target 'all-recursive' failed [ 215s] make[2]: *** [all-recursive] Error 1 [ 215s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 215s] Makefile:373: recipe for target 'all' failed [ 215s] make[1]: *** [all] Error 2 [ 215s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 215s] dh_auto_build: make -j1 returned exit code 2 [ 215s] debian/rules:45: recipe for target 'build' failed [ 215s] make: *** [build] Error 2 [ 215s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 215s] [ 215s] cloud129 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:35:54 UTC 2018. [ 215s] [ 216s] ### VM INTERACTION START ### [ 219s] [ 192.809144] sysrq: SysRq : Power Off [ 219s] [ 192.931852] reboot: Power down [ 220s] ### VM INTERACTION END ### [ 220s] [ 220s] cloud129 failed "build osmo-bsc_1.3.0.43.a7b8.dsc" at Tue Aug 28 20:35:59 UTC 2018. [ 220s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:39:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:39:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: fix log of conn_id presence Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10674 Change subject: mgcp_test: fix log of conn_id presence ...................................................................... mgcp_test: fix log of conn_id presence Flip logic to accurately log whether an 'I:' is included, instead of logging the opposite. Note that it isn't possible to log the actual conn ID, because they are random and differ in every test run, which would collide with the fixed expected output file mgcp_test.ok. Change-Id: Idcd731b9daf618b97d8f7e6a776266071cd29e08 --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/74/10674/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index f8f701e..228b2f9 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -737,7 +737,7 @@ if (msg) { rc = get_conn_id_from_response(msg->data, last_conn_id, sizeof(last_conn_id)); - if (rc) + if (rc == 0) printf("(response contains a connection id)\n"); else printf("(response does not contain a connection id)\n"); diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index fcad85a..915d45e 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -22,7 +22,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing AUEP2 @@ -34,7 +34,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing MDCX1 @@ -46,7 +46,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing MDCX2 @@ -58,7 +58,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX @@ -79,7 +79,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -93,7 +93,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -117,7 +117,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -141,7 +141,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -165,7 +165,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -189,7 +189,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -213,7 +213,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) ================================================ Testing MDCX4_RO @@ -228,7 +228,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -243,7 +243,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX_ZYN @@ -256,7 +256,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -277,7 +277,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing SHORT2 @@ -288,7 +288,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing SHORT3 @@ -299,7 +299,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing SHORT4 @@ -310,7 +310,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing RQNT1 @@ -324,7 +324,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing RQNT2 @@ -338,7 +338,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing DLCX @@ -352,7 +352,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX @@ -373,7 +373,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -387,7 +387,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -402,7 +402,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX @@ -416,7 +416,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -439,7 +439,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ -- To view, visit https://gerrit.osmocom.org/10674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idcd731b9daf618b97d8f7e6a776266071cd29e08 Gerrit-Change-Number: 10674 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:39:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:39:26 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: fix get_conn_id_from_response() CI length Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10675 Change subject: mgcp_test: fix get_conn_id_from_response() CI length ...................................................................... mgcp_test: fix get_conn_id_from_response() CI length This function is set on conn ID length of 32 characters. Make it detect a shorter length also when parsing 'o=-' headers. Before, this failed to recognize a space as the end of the conn ID, now sees any non-hex char as end. Related: OS#3507 Change-Id: I762c273bac172acb6d0aae6ea6267603ab654cbf --- M tests/mgcp/mgcp_test.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/10675/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 228b2f9..2f3a8a7 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -37,6 +37,7 @@ #include #include #include +#include char *strline_r(char *str, char **saveptr); @@ -626,8 +627,10 @@ if (got_conn_id) { for (i = 0; i < conn_id_len; i++) { - if (conn_id[i] == '\n' || conn_id[i] == '\r') + if (!isxdigit(conn_id[i])) { conn_id[i] = '\0'; + break; + } } /* A valid conn_id must at least contain one digit, and must -- To view, visit https://gerrit.osmocom.org/10675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I762c273bac172acb6d0aae6ea6267603ab654cbf Gerrit-Change-Number: 10675 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:39:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:39:26 +0000 Subject: Change in osmo-mgw[master]: generate shorter 'I:' conn IDs Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10676 Change subject: generate shorter 'I:' conn IDs ...................................................................... generate shorter 'I:' conn IDs Reduce the number of hex chars generated as Connection Identifier from 32 to 8. According to RFC3435 2.1.3.2 "Names of Connections", the maximum length is indeed 32 characters, but there isn't really a benefit of using IDs of that size. That, and: A specific SCCPlite MSC is seen to be able to store conn IDs of up to 8 hex characters of length. If given more than that, it will later send 'ffffffff' as ID, e.g. in the DLCX message, causing mismatches and rejected DLCX. Conn IDs need to be unique only within the context of one endpoint, so producing 32 characters of ID is far beyond overkill, especially if we currently expect exactly two IDs per endpoint. The nicer solution would be to make the length of generated ID configurable, but it would also require some code refactoring to handle a variable length of ID internally. We can safely and simply go with a fixed length of 8 chars. Related: OS#3507 Change-Id: Ia290c22a91fca0e5aa44515fca6df00064aff100 --- M include/osmocom/mgcp/mgcp_common.h M src/libosmo-mgcp/mgcp_conn.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/76/10676/1 diff --git a/include/osmocom/mgcp/mgcp_common.h b/include/osmocom/mgcp/mgcp_common.h index b2c7370..0be227f 100644 --- a/include/osmocom/mgcp/mgcp_common.h +++ b/include/osmocom/mgcp/mgcp_common.h @@ -81,7 +81,7 @@ /* String length of Connection Identifiers * (see also RFC3435 2.1.3.2 Names of Connections) */ -#define MGCP_CONN_ID_LENGTH 32+1 +#define MGCP_CONN_ID_LENGTH 8+1 /* String length of Endpoint Identifiers. / (see also RFC3435 section 3.2.1.3) */ diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 3a5db0f..8d855f2 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -58,7 +58,7 @@ int i; int k; int rc; - uint8_t id_bin[16]; + uint8_t id_bin[4]; char *id_hex; /* Generate a connection id that is unique for the current endpoint. -- To view, visit https://gerrit.osmocom.org/10676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia290c22a91fca0e5aa44515fca6df00064aff100 Gerrit-Change-Number: 10676 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:39:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:39:27 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): compare conn Id ('I:') case insensitively Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10677 Change subject: mgcp_conn_get(): compare conn Id ('I:') case insensitively ...................................................................... mgcp_conn_get(): compare conn Id ('I:') case insensitively The Connection Identifier is defined as a hex string, so clients may send the ID back in lower case. Convert to upper case before comparing. A specific SCCPlite MSC is observed to DLCX with Connection Identifier in lower case, which would mismatch pefore this patch. Add test_conn_id_matching() in mgcp_test.c to verify case insensitivity. Related: OS#3508 Change-Id: I8e52278c3abe9e9c8c848c2b1538bce443f68a43 --- M src/libosmo-mgcp/mgcp_conn.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 52 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/77/10677/1 diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 8d855f2..89c55ed 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -188,9 +188,21 @@ struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id) { struct mgcp_conn *conn; + char id_upper[MGCP_CONN_ID_LENGTH]; + int i; + + if (!id || !*id) + return NULL; + + /* Use uppercase to compare identifiers, to avoid mismatches: RFC3435 2.1.3.2 "Names of + * Connections" defines the id as a hex string, so clients may return lower case hex even though + * we sent upper case hex in the CRCX response. */ + osmo_strlcpy(id_upper, id, sizeof(id_upper)); + for (i = 0; i < MGCP_CONN_ID_LENGTH; i++) + id_upper[i] = toupper(id_upper[i]); llist_for_each_entry(conn, &endp->conns, entry) { - if (strncmp(conn->id, id, sizeof(conn->id)) == 0) + if (strncmp(conn->id, id_upper, sizeof(conn->id)) == 0) return conn; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 2f3a8a7..bb1cd98 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1744,6 +1744,40 @@ OSMO_ASSERT(pt_dst == -EINVAL); } +void test_conn_id_matching() +{ + struct mgcp_endpoint endp = {}; + struct mgcp_conn *conn; + struct mgcp_conn *conn_match; + int i; + const char *conn_id_generated = "000023AB"; + const char *conn_id_request[] = { + "000023AB", + "000023ab", + }; + + printf("\nTesting %s\n", __func__); + + INIT_LLIST_HEAD(&endp.conns); + + conn = talloc_zero(NULL, struct mgcp_conn); + OSMO_ASSERT(conn); + osmo_strlcpy(conn->id, conn_id_generated, sizeof(conn->id)); + llist_add(&conn->entry, &endp.conns); + + for (i = 0; i < ARRAY_SIZE(conn_id_request); i++) { + const char *needle = conn_id_request[i]; + printf("needle='%s' ", needle); + conn_match = mgcp_conn_get(&endp, needle); + OSMO_ASSERT(conn_match); + printf("found '%s'\n", conn_match->id); + OSMO_ASSERT(conn_match == conn); + } + + llist_del(&conn->entry); + talloc_free(conn); +} + int main(int argc, char **argv) { void *ctx = talloc_named_const(NULL, 0, "mgcp_test"); @@ -1768,6 +1802,7 @@ test_get_lco_identifier(); test_check_local_cx_options(ctx); test_mgcp_codec_pt_translate(); + test_conn_id_matching(); OSMO_ASSERT(talloc_total_size(msgb_ctx) == 0); OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1); diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 915d45e..34dcd14 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1156,4 +1156,8 @@ '' -> '(null)' p10, aPCMU -> (null) '10,a :PCMU' -> '(null)' + +Testing test_conn_id_matching +needle='000023AB' found '000023AB' +needle='000023ab' found '000023AB' Done -- To view, visit https://gerrit.osmocom.org/10677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e52278c3abe9e9c8c848c2b1538bce443f68a43 Gerrit-Change-Number: 10677 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:39:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:39:27 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): match conn Id ('I:') despite leading zeros Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10678 Change subject: mgcp_conn_get(): match conn Id ('I:') despite leading zeros ...................................................................... mgcp_conn_get(): match conn Id ('I:') despite leading zeros The Connection Identifier is defined as a hex string, so clients may send the ID back with or without leading zeros. Ignore all leading zeros when comparing. A specific SCCPlite MSC is observed to DLCX with Connection Identifier with leading zeros removed, which would mismatch pefore this patch. Extend test_conn_id_matching() in mgcp_test.c to include leading zero tests. Related: OS#3509 Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91 --- M src/libosmo-mgcp/mgcp_conn.c M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 3 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/78/10678/1 diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 89c55ed..9027411 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -189,11 +189,16 @@ { struct mgcp_conn *conn; char id_upper[MGCP_CONN_ID_LENGTH]; + const char *conn_id; int i; if (!id || !*id) return NULL; + /* Ignore leading zeros in needle */ + while (*id == '0') + id++; + /* Use uppercase to compare identifiers, to avoid mismatches: RFC3435 2.1.3.2 "Names of * Connections" defines the id as a hex string, so clients may return lower case hex even though * we sent upper case hex in the CRCX response. */ @@ -202,7 +207,10 @@ id_upper[i] = toupper(id_upper[i]); llist_for_each_entry(conn, &endp->conns, entry) { - if (strncmp(conn->id, id_upper, sizeof(conn->id)) == 0) + /* Ignore leading zeros in haystack */ + for (conn_id=conn->id; *conn_id == '0'; conn_id++); + + if (strcmp(conn_id, id_upper) == 0) return conn; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index bb1cd98..ea66069 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1752,8 +1752,14 @@ int i; const char *conn_id_generated = "000023AB"; const char *conn_id_request[] = { + "23AB", + "0023AB", "000023AB", + "00000023AB", + "23ab", + "0023ab", "000023ab", + "00000023ab", }; printf("\nTesting %s\n", __func__); diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 34dcd14..9a6d5c2 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -1158,6 +1158,12 @@ '10,a :PCMU' -> '(null)' Testing test_conn_id_matching +needle='23AB' found '000023AB' +needle='0023AB' found '000023AB' needle='000023AB' found '000023AB' +needle='00000023AB' found '000023AB' +needle='23ab' found '000023AB' +needle='0023ab' found '000023AB' needle='000023ab' found '000023AB' +needle='00000023ab' found '000023AB' Done -- To view, visit https://gerrit.osmocom.org/10678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91 Gerrit-Change-Number: 10678 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:39:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:39:27 +0000 Subject: Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10679 Change subject: cosmetic: mgcp_test: fix get_conn_id_from_response() ...................................................................... cosmetic: mgcp_test: fix get_conn_id_from_response() This function is implemented in such a weird way that I couldn't stop myself from rewriting it. Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b --- M tests/mgcp/mgcp_test.c 1 file changed, 30 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/79/10679/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index ea66069..a26acf9 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -600,47 +600,42 @@ MGCP_CONN_RECV_SEND); } -/* Extract a connection ID from a response (CRCX) */ +/* Extract a connection ID from a response and return in conn_id; + * if there is none, return -EINVAL and leave conn_id unchanged. */ static int get_conn_id_from_response(uint8_t *resp, char *conn_id, - unsigned int conn_id_len) + size_t conn_id_buflen) { - char *conn_id_ptr; - int i; - bool got_conn_id = false; + const char *conn_id_start; + const char *conn_id_end; + int conn_id_len; - /* First try to get the conn_id from the I: parameter */ - conn_id_ptr = strstr((char *)resp, "I: "); - if (conn_id_ptr) { - memset(conn_id, 0, conn_id_len); - memcpy(conn_id, conn_id_ptr + 3, 32); - got_conn_id = true; - } else { - /* Alternatively try to extract the conn_id from the o=- SDP - * parameter */ - conn_id_ptr = strstr((char *)resp, "o=- "); - if(conn_id_ptr) { - memset(conn_id, 0, conn_id_len); - memcpy(conn_id, conn_id_ptr + 4, 32); - got_conn_id = true; - } - } + const char *header_I = "\r\nI: "; + const char *header_o = "\r\no=- "; - if (got_conn_id) { - for (i = 0; i < conn_id_len; i++) { - if (!isxdigit(conn_id[i])) { - conn_id[i] = '\0'; - break; - } - } + /* Try to get the conn_id from the 'I:' or 'o=-' parameter */ + if ((conn_id_start = strstr((char *)resp, header_I))) { + conn_id_start += strlen(header_I); + conn_id_end = strstr(conn_id_start, "\r\n"); + } else if ((conn_id_start = strstr((char *)resp, header_o))) { + conn_id_start += strlen(header_o); + conn_id_end = strchr(conn_id_start, ' '); + } else + return -EINVAL; - /* A valid conn_id must at least contain one digit, and must - * not exceed a length of 32 digits */ - OSMO_ASSERT(strlen(conn_id) <= 32); - OSMO_ASSERT(strlen(conn_id) > 0); + if (conn_id_end) + conn_id_len = conn_id_end - conn_id_start; + else + conn_id_len = strlen(conn_id_start); + OSMO_ASSERT(conn_id_len <= conn_id_buflen - 1); - return 0; - } - return -EINVAL; + /* A valid conn_id must at least contain one digit, and must + * not exceed a length of 32 digits */ + OSMO_ASSERT(conn_id_len <= 32); + OSMO_ASSERT(conn_id_len > 0); + + strncpy(conn_id, conn_id_start, conn_id_len); + conn_id[conn_id_len] = '\0'; + return 0; } /* Check response, automatically patch connection ID if needed */ -- To view, visit https://gerrit.osmocom.org/10679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b Gerrit-Change-Number: 10679 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:39:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:39:27 +0000 Subject: Change in osmo-mgw[master]: comment: indicate struct type for mgcp_endpoint.conns Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10680 Change subject: comment: indicate struct type for mgcp_endpoint.conns ...................................................................... comment: indicate struct type for mgcp_endpoint.conns Change-Id: Ia65359c22da3e7b28e3f23b36446ca434ca0be8c --- M include/osmocom/mgcp/mgcp_endp.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/80/10680/1 diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index d834c09..a23e192 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -69,7 +69,7 @@ /*! Local connection options (see mgcp_internal.h) */ struct mgcp_lco local_options; - /*! List with connections active on this endpoint */ + /*! List of struct mgcp_conn, of the connections active on this endpoint */ struct llist_head conns; /*! Backpointer to the MGW configuration */ -- To view, visit https://gerrit.osmocom.org/10680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia65359c22da3e7b28e3f23b36446ca434ca0be8c Gerrit-Change-Number: 10680 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:42:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:42:32 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident_vty.c: fix CI format, should be 16bit In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10633 to look at the new patch set (#2). Change subject: neighbor_ident_vty.c: fix CI format, should be 16bit ...................................................................... neighbor_ident_vty.c: fix CI format, should be 16bit In the 'lac-ci' and 'cgi' neighbor identity VTY parameters, fix the CI part to <0-65535>. Use 65535 as CI in the neighbor_ident.vty test to verify the range. Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/33/10633/2 -- To view, visit https://gerrit.osmocom.org/10633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f Gerrit-Change-Number: 10633 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:46:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:46:59 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident_vty.c: fix CI format, should be 16bit In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10633 ) Change subject: neighbor_ident_vty.c: fix CI format, should be 16bit ...................................................................... Patch Set 2: Code-Review+2 re-add previous +2, after trivial fixes of neighbor_ident.vty expectations -- To view, visit https://gerrit.osmocom.org/10633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f Gerrit-Change-Number: 10633 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 29 Aug 2018 00:46:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 00:48:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 00:48:24 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: continue despite missing Classmark In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10634 ) Change subject: inter-BSC HO incoming: continue despite missing Classmark ...................................................................... Patch Set 3: Code-Review+2 added the 3GPP spec details (and notified the customer). Re-adding previous +2 after the commit log addition. -- To view, visit https://gerrit.osmocom.org/10634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 Gerrit-Change-Number: 10634 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 29 Aug 2018 00:48:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:11:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:11:51 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident_vty.c: fix CI format, should be 16bit In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10633 ) Change subject: neighbor_ident_vty.c: fix CI format, should be 16bit ...................................................................... neighbor_ident_vty.c: fix CI format, should be 16bit In the 'lac-ci' and 'cgi' neighbor identity VTY parameters, fix the CI part to <0-65535>. Use 65535 as CI in the neighbor_ident.vty test to verify the range. Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 16 insertions(+), 16 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 993e0b4..28f4afd 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -77,7 +77,7 @@ #define LAC_PARAMS "lac <0-65535>" #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" -#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>" +#define LAC_CI_PARAMS "lac-ci <0-65535> <0-65535>" #define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n" #define LOCAL_BTS_PARAMS "bts <0-255>" @@ -379,7 +379,7 @@ } DEFUN(cfg_neighbor_add_cgi_arfcn_bsic, cfg_neighbor_add_cgi_arfcn_bsic_cmd, - NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, + NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS, NEIGHBOR_ADD_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC) { struct neighbor_ident_key nik; diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 692d894..bbdb461 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -38,7 +38,7 @@ OsmoBSC(config-net-bts)# type sysmobts OsmoBSC(config-net-bts)# base_station_id_code 12 OsmoBSC(config-net-bts)# location_area_code 22 -OsmoBSC(config-net-bts)# cell_identity 32 +OsmoBSC(config-net-bts)# cell_identity 65535 OsmoBSC(config-net-bts)# trx 0 OsmoBSC(config-net-bts-trx)# arfcn 42 OsmoBSC(config-net-bts-trx)# exit @@ -68,7 +68,7 @@ ... bts 2 ... - cell_identity 32 + cell_identity 65535 location_area_code 22 base_station_id_code 12 ... @@ -82,10 +82,10 @@ ... neighbor add bts <0-255> neighbor add lac <0-65535> - neighbor add lac-ci <0-65535> <0-255> + neighbor add lac-ci <0-65535> <0-65535> neighbor add lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) - neighbor add lac-ci <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any) - neighbor add cgi <0-999> <0-999> <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any) + neighbor add lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) + neighbor add cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor del bts <0-255> neighbor del arfcn <0-1023> bsic (<0-63>|any) ... @@ -106,7 +106,7 @@ % BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11 OsmoBSC(config-net-bts)# neighbor add lac 22 -% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 32 and ARFCN 42 BSIC 12 +% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12 OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42 % BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry @@ -148,7 +148,7 @@ bts 0 ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add cgi 023 42 423 5 arfcn 23 bsic 42 neighbor add cgi 023 042 423 6 arfcn 23 bsic 42 neighbor add cgi 023 042 234 56 arfcn 23 bsic 42 @@ -179,7 +179,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac 456 arfcn 123 bsic 45 neighbor add lac-ci 789 10 arfcn 423 bsic any neighbor add lac-ci 789 10 arfcn 423 bsic 63 @@ -192,7 +192,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac-ci 789 10 arfcn 423 bsic any neighbor add lac-ci 789 10 arfcn 423 bsic 63 neighbor add lac-ci 789 10 arfcn 423 bsic 1 @@ -204,7 +204,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac-ci 789 10 arfcn 423 bsic 63 neighbor add lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor add @@ -215,7 +215,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 neighbor add lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor add @@ -225,7 +225,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add neighbor add lac-ci 21 31 - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 ... !neighbor add OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any @@ -233,7 +233,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 ... !neighbor add OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any @@ -241,7 +241,7 @@ OsmoBSC(config-net-bts)# show running-config ... !neighbor add - neighbor add lac-ci 22 32 + neighbor add lac-ci 22 65535 ... !neighbor add OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12 -- To view, visit https://gerrit.osmocom.org/10633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f Gerrit-Change-Number: 10633 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:11:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:11:52 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: continue despite missing Classmark In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10634 ) Change subject: inter-BSC HO incoming: continue despite missing Classmark ...................................................................... inter-BSC HO incoming: continue despite missing Classmark 3GPP mandates either Classmark Information 1 or 2 in BSSMAP Handover Request, but an SCCPlite MSC currently tested does not pass either of them. Make this missing IE a non-fatal error, continuing anyway should work out. See 3GPP TS 48.008, 3.2.1.8 HANDOVER REQUEST, where it says "Classmark Information 1 or Classmark Information 2" with note 6: "One of these two elements is sent." Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 --- M src/osmo-bsc/handover_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index c2f5c8b..e3e8ae1 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -424,10 +424,10 @@ } memcpy(&req->classmark.classmark2, e->val, len); req->classmark.classmark2_len = len; - } else { - LOG_HO(conn, LOGL_ERROR, "Missing IE: either Classmark Information 1 or 2 required\n"); - return false; - } + } else + LOG_HO(conn, LOGL_INFO, + "Missing mandatory IE: 3GPP mandates either Classmark Information 1 or 2" + " in BSSMAP Handover Request, but neither are present. Will continue without.\n"); if (TLVP_PRESENT(tp, GSM0808_IE_AOIP_TRASP_ADDR)) { int rc; -- To view, visit https://gerrit.osmocom.org/10634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34d64b028210b4df8652fee1a8830ec4a4e3ac11 Gerrit-Change-Number: 10634 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:11:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:11:52 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO incoming: drop old/wrong RTP port code In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10635 ) Change subject: inter-BSC HO incoming: drop old/wrong RTP port code ...................................................................... inter-BSC HO incoming: drop old/wrong RTP port code Drop nonsensical legacy code. The Circuit Identifier Code in A/SCCPlite does *not* indicate the RTP port to use. Rather, it indicates the MGW endpoint name to use when configuring the BSC's side of the MGW endpoint, and only the MGW will ever know the RTP port. Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed --- M src/osmo-bsc/handover_fsm.c 1 file changed, 0 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index e3e8ae1..a42f10c 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -487,25 +487,8 @@ OSMO_STRLCPY_ARRAY(req->cell_id_target_name, gsm0808_cell_id_name(&req->cell_id_target)); if ((e = TLVP_GET(tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE))) { - int timeslot; - int multiplex; - /* CIC is permitted in both AoIP and SCCPlite */ req->msc_assigned_cic = osmo_load16be(e->val); - - /* For SCCPlite, the CIC implies the RTP port to use */ - if (sccplite) { - timeslot = req->msc_assigned_cic & 0x1f; - multiplex = (req->msc_assigned_cic & ~0x1f) >> 5; - req->msc_assigned_rtp_port = mgcp_timeslot_to_port(multiplex, timeslot, - conn->sccp.msc->rtp_base); - LOG_HO(conn, LOGL_DEBUG, "Derived RTP port from MSC assigned CIC:" - " CIC=0x%x (timeslot=%d multiplex=%d) rtp_base=%d=0x%x RTP-port=%u\n", - req->msc_assigned_cic, timeslot, multiplex, - conn->sccp.msc->rtp_base, conn->sccp.msc->rtp_base, - req->msc_assigned_rtp_port); - } - } else if (sccplite) { /* no CIC but SCCPlite: illegal */ LOG_HO(conn, LOGL_ERROR, "SCCPlite MSC, but no CIC in incoming inter-BSC Handover\n"); -- To view, visit https://gerrit.osmocom.org/10635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I471bd5e5cc2a083dd37290aeaae5c334ca5f7eed Gerrit-Change-Number: 10635 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:11:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:11:53 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: lchan_fail_to(): store target state early In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10636 ) Change subject: lchan_fsm: lchan_fail_to(): store target state early ...................................................................... lchan_fsm: lchan_fail_to(): store target state early lchan_fail_to() is a macro to preserve useful source file:line information in logging. But a side effect is that its target state argument might evaluate differently at the end of the macro, if, say, the fi->state has changed. I hit such an instance on timeout of WAIT_RLL_RTP_ESTABLISH: lchan_fsm_timer_cb() calls macro lchan_fail(), which calls lchan_fail_to(lchan_fsm_on_error[fi->state]). Unlike for normal function invocation, this argument changes as fi->state changes. Since releasing the lchan_rtp_fsm already transitions the lchan fi into WAIT_RF_RELEASE_ACK, the final state change of lchan_fail_to() suddenly evaluates to the broken state instead of the intended WAIT_RF_RELEASE_ACK. Early in lchan_fail_to(), store the argument's value as of macro invocation. Change-Id: Id9bf4580a112ee5629f553a8bcb6b5b03b1c5f53 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9c22bde..e0015cb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -211,9 +211,11 @@ /* Set a failure message, trigger the common actions to take on failure, transition to a state to * continue with (using state timeouts from lchan_fsm_timeouts[]). Assumes local variable fi exists. */ -#define lchan_fail_to(state_chg, fmt, args...) do { \ +#define lchan_fail_to(STATE_CHG, fmt, args...) do { \ struct gsm_lchan *_lchan = fi->priv; \ uint32_t state_was = fi->state; \ + /* Snapshot the target state, in case the macro argument evaluates differently later */ \ + const uint32_t state_chg = STATE_CHG; \ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ osmo_fsm_state_name(fi->fsm, state_was), ## args); \ -- To view, visit https://gerrit.osmocom.org/10636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id9bf4580a112ee5629f553a8bcb6b5b03b1c5f53 Gerrit-Change-Number: 10636 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:11:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:11:53 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan_fsm failure: log about state transitions In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10637 ) Change subject: cosmetic: lchan_fsm failure: log about state transitions ...................................................................... cosmetic: lchan_fsm failure: log about state transitions Early on during failure, log which state transition is intended after failure handling. If such state is already reached after failure handling, do not log "state transition not permitted", but rather skip the state change and log "Already in state X". Change-Id: I81f53b38637823e62860cb773b7573bb5c21fdb0 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e0015cb..e856fd0 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -213,16 +213,23 @@ * continue with (using state timeouts from lchan_fsm_timeouts[]). Assumes local variable fi exists. */ #define lchan_fail_to(STATE_CHG, fmt, args...) do { \ struct gsm_lchan *_lchan = fi->priv; \ + struct osmo_fsm *fsm = fi->fsm; \ uint32_t state_was = fi->state; \ /* Snapshot the target state, in case the macro argument evaluates differently later */ \ const uint32_t state_chg = STATE_CHG; \ + LOG_LCHAN(_lchan, LOGL_DEBUG, "Handling failure, will then transition to state %s\n", \ + osmo_fsm_state_name(fsm, state_chg)); \ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ - osmo_fsm_state_name(fi->fsm, state_was), ## args); \ + osmo_fsm_state_name(fsm, state_was), ## args); \ if (!_lchan->activate.concluded) \ lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ _lchan->activate.concluded = true; \ - lchan_fsm_state_chg(state_chg); \ + if (fi->state != state_chg) \ + lchan_fsm_state_chg(state_chg); \ + else \ + LOG_LCHAN(_lchan, LOGL_DEBUG, "After failure handling, already in state %s\n", \ + osmo_fsm_state_name(fsm, state_chg)); \ } while(0) /* Which state to transition to when lchan_fail() is called in a given state. */ -- To view, visit https://gerrit.osmocom.org/10637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I81f53b38637823e62860cb773b7573bb5c21fdb0 Gerrit-Change-Number: 10637 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:12:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:12:07 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm: safer 'concluded' flag In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10638 ) Change subject: lchan_fsm: safer 'concluded' flag ...................................................................... lchan_fsm: safer 'concluded' flag The flag lchan->activate.concluded prevents entering the lchan_on_fully_established()/lchan_on_activation_failure() more than once. So far it was checked by callers, instead place in the functions themselves. There is a potential functional change here, since during lchan_fail(), the concluded flag was set only after entering lchan_on_activation_failure(). Now it is already set at the start and prevents multiple re-entry beyond doubt. This patch is not a result of an actual observed faulty behavior, just from reading the code and seeing the slight loophole. Change-Id: I0c906438b05442d66255203eb816453b7193a6d8 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 13 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index b827d0a..d6e8954 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -505,7 +505,10 @@ struct { enum lchan_activate_mode activ_for; bool activ_ack; /*< true as soon as RSL Chan Activ Ack is received */ - bool concluded; /*< true as soon as LCHAN_ST_ESTABLISHED is reached */ + /*! This flag ensures that when an lchan activation has succeeded, and we have already + * sent ACKs like Immediate Assignment or BSSMAP Assignment Complete, and if other errors + * occur later, e.g. during release, that we don't send a NACK out of context. */ + bool concluded; bool requires_voice_stream; bool wait_before_switching_rtp; /*< true = requires LCHAN_EV_READY_TO_SWITCH_RTP */ uint16_t msc_assigned_cic; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e856fd0..13ae7ad 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -88,6 +88,10 @@ struct gsm_subscriber_connection *for_conn, const char *file, int line) { + if (lchan->activate.concluded) + return; + lchan->activate.concluded = true; + switch (activ_for) { case FOR_MS_CHANNEL_REQUEST: @@ -135,6 +139,10 @@ static void lchan_on_fully_established(struct gsm_lchan *lchan) { + if (lchan->activate.concluded) + return; + lchan->activate.concluded = true; + switch (lchan->activate.activ_for) { case FOR_MS_CHANNEL_REQUEST: /* No signalling to do here, MS is free to use the channel, and should go on to connect @@ -222,9 +230,7 @@ lchan_set_last_error(_lchan, "lchan %s in state %s: " fmt, \ _lchan->activate.concluded ? "failure" : "allocation failed", \ osmo_fsm_state_name(fsm, state_was), ## args); \ - if (!_lchan->activate.concluded) \ - lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ - _lchan->activate.concluded = true; \ + lchan_on_activation_failure(_lchan, _lchan->activate.activ_for, _lchan->conn); \ if (fi->state != state_chg) \ lchan_fsm_state_chg(state_chg); \ else \ @@ -751,10 +757,6 @@ return; } - /* This flag ensures that when an lchan activation has succeeded, and we have already sent ACKs - * like Immediate Assignment or BSSMAP Assignment Complete, and if then, way later, some other - * error occurs, e.g. during release, that we don't send a NACK out of context. */ - lchan->activate.concluded = true; lchan_on_fully_established(lchan); } -- To view, visit https://gerrit.osmocom.org/10638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0c906438b05442d66255203eb816453b7193a6d8 Gerrit-Change-Number: 10638 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:12:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:12:07 +0000 Subject: Change in osmo-bsc[master]: log: lchan_rtp_fsm: add missing '\n' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10639 ) Change subject: log: lchan_rtp_fsm: add missing '\n' ...................................................................... log: lchan_rtp_fsm: add missing '\n' Change-Id: Ifa46295ef23cf3728bc946fe27b34f0607a24c9e --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 93883af..bf73429 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -141,7 +141,7 @@ struct mgcp_conn_peer crcx_info = {}; if (use_mgwep_ci) { - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint already available: %s", + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint already available: %s\n", mgwep_ci_name(use_mgwep_ci)); lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY); return; @@ -174,7 +174,7 @@ switch (event) { case LCHAN_RTP_EV_MGW_ENDPOINT_AVAILABLE: - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint: %s", + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint: %s\n", mgwep_ci_name(lchan_use_mgw_endpoint_ci_bts(lchan))); lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY); return; @@ -205,7 +205,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); if (lchan->activate.activ_ack) { - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Activ Ack received earlier, no need to wait"); + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Activ Ack received earlier, no need to wait\n"); lchan_rtp_fsm_post_lchan_ready(fi); } } @@ -426,7 +426,7 @@ return; } - LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Sending BTS side RTP port info %s:%u to MGW %s", + LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Sending BTS side RTP port info %s:%u to MGW %s\n", mdcx_info.addr, mdcx_info.port, mgwep_ci_name(ci)); mgw_endpoint_ci_request(ci, MGCP_VERB_MDCX, &mdcx_info, fi, LCHAN_RTP_EV_MGW_ENDPOINT_CONFIGURED, -- To view, visit https://gerrit.osmocom.org/10639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifa46295ef23cf3728bc946fe27b34f0607a24c9e Gerrit-Change-Number: 10639 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:12:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:12:25 +0000 Subject: Change in osmo-bsc[master]: log: 'sending BSSMAP HO Request ACK' In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10640 ) Change subject: log: 'sending BSSMAP HO Request ACK' ...................................................................... log: 'sending BSSMAP HO Request ACK' Change-Id: Ie472c32861d9c9ca9ebec0221837030ffd83c73a --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index c067dd3..560bddc 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1041,6 +1041,7 @@ struct msgb *msg; struct gsm_lchan *new_lchan = conn->ho.new_lchan; + LOG_HO(conn, LOGL_DEBUG, "Sending BSSMAP Handover Request Acknowledge\n"); msg = gsm0808_create_handover_request_ack(rr_ho_command->data, rr_ho_command->len, gsm0808_chosen_channel(new_lchan->type, new_lchan->tch_mode), -- To view, visit https://gerrit.osmocom.org/10640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie472c32861d9c9ca9ebec0221837030ffd83c73a Gerrit-Change-Number: 10640 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 01:12:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 01:12:36 +0000 Subject: Change in osmo-bsc[master]: inter-BSC HO: send failure msg directly In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10641 ) Change subject: inter-BSC HO: send failure msg directly ...................................................................... inter-BSC HO: send failure msg directly If inter-BSC HO failed, the conn is by definition not in an active state, and hence it makes no sense to verify the gscon FSM state before sending. Directly call osmo_bsc_sigtran_send(). Change-Id: Ic49c94462041800674fa961c4d19c0c045bfe0c0 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 560bddc..03e073a 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -1121,7 +1121,7 @@ return; } - rc = gscon_sigtran_send(conn, msg); + rc = osmo_bsc_sigtran_send(conn, msg); if (rc) LOG_HO(conn, LOGL_ERROR, "Cannot send BSSMAP Handover Failure message (rc=%d %s)\n", rc, strerror(-rc)); -- To view, visit https://gerrit.osmocom.org/10641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic49c94462041800674fa961c4d19c0c045bfe0c0 Gerrit-Change-Number: 10641 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 03:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 03:42:13 +0000 Subject: Change in osmo-gsm-tester[master]: Check for smpplib being installed as well Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10681 Change subject: Check for smpplib being installed as well ...................................................................... Check for smpplib being installed as well from the docs: pip3 install git+git://github.com/podshumok/python-smpplib.git Change-Id: I6be1c961e512e68d5bed8b317d1dda363a58fbe7 --- M check_dependencies.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/81/10681/1 diff --git a/check_dependencies.py b/check_dependencies.py index ff78fe3..83df7a9 100755 --- a/check_dependencies.py +++ b/check_dependencies.py @@ -25,5 +25,6 @@ import pydbus import sqlite3 import sispm +import smpplib print('dependencies ok') -- To view, visit https://gerrit.osmocom.org/10681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6be1c961e512e68d5bed8b317d1dda363a58fbe7 Gerrit-Change-Number: 10681 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 03:42:14 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 03:42:14 +0000 Subject: Change in osmo-gsm-tester[master]: Generate imsi/ki on OsmoMobile construction Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10682 Change subject: Generate imsi/ki on OsmoMobile construction ...................................................................... Generate imsi/ki on OsmoMobile construction Take an IMSI/KI when creating the OsmoMobile and not when starting it. This will allow other code to know which IMSIs will be used before the system starts (e.g. to add it to the HLR/nitb db). Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b --- M src/osmo_ms_driver/starter.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/82/10682/1 diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 243dedc..bab468c 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -71,6 +71,7 @@ self._imsi_ki_generator = imsi_ki_generator self._phy_filename = phy_filename self._ev_server_path = ev_server_path + self._imsi, self._ki = next(self._imsi_ki_generator) def write_lua_cfg(self): lua_support = os.path.join(os.path.dirname(__file__), 'lua') @@ -87,13 +88,12 @@ return lua_cfg_file def write_mob_cfg(self, lua_filename, phy_filename): - (imsi, ki) = next(self._imsi_ki_generator) cfg = { 'test': { 'script': lua_filename, 'virt_phy': phy_filename, - 'imsi': imsi, - 'ki_comp128': ki, + 'imsi': self._imsi, + 'ki_comp128': self._ki, 'ms_number': self._name_number, } } -- To view, visit https://gerrit.osmocom.org/10682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b Gerrit-Change-Number: 10682 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 03:42:15 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 03:42:15 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10683 Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Allow to access imsi/ki from the OsmoMobile instances Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 --- M src/osmo_ms_driver/starter.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/83/10683/1 diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index bab468c..86ad446 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -73,6 +73,12 @@ self._ev_server_path = ev_server_path self._imsi, self._ki = next(self._imsi_ki_generator) + def imsi(self): + return self._imsi + + def ki(self): + return self._ki + def write_lua_cfg(self): lua_support = os.path.join(os.path.dirname(__file__), 'lua') cfg = { -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 03:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 03:42:16 +0000 Subject: Change in osmo-gsm-tester[master]: Keep track of all mobiles and copy them to unstarted later Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10684 Change subject: Keep track of all mobiles and copy them to unstarted later ...................................................................... Keep track of all mobiles and copy them to unstarted later At all times have a list of mobiles that were created. Use a shallow copy to initialize them as unstarted. Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 --- M src/osmo_ms_driver/location_update_test.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/84/10684/1 diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index 2c59d97..e83d91b 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . - +from copy import copy from osmo_gsm_tester import log from .starter import OsmoVirtPhy, OsmoMobile from .test_support import imsi_ki_gen, Results @@ -62,6 +62,7 @@ self._cdf = cdf_function self._cdf.set_target(number_of_ms) self._unstarted = [] + self._mobiles = [] self._phys = [] self._results = {} imsi_gen = imsi_ki_gen() @@ -78,9 +79,13 @@ phy.phy_filename(), event_server.server_path()) self._results[ms_name] = LUResult(ms_name) - self._unstarted.append(launcher) + self._mobiles.append(launcher) self._event_server = event_server self._event_server.register(self.handle_msg) + self._unstarted = copy(self._mobiles) + + def mobiles(self): + return self._mobiles def pre_launch(self, loop): """ -- To view, visit https://gerrit.osmocom.org/10684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 Gerrit-Change-Number: 10684 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 03:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 03:42:16 +0000 Subject: Change in osmo-gsm-tester[master]: Always initialize the _started in the test Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10685 Change subject: Always initialize the _started in the test ...................................................................... Always initialize the _started in the test We don't know at which state the termiation routine will be called and it is best to have a fully initialized object. In prepare we start with a fresh list just to be sure. Change-Id: I675772c89e32620da5695aa4793b735cc266684c --- M src/osmo_ms_driver/location_update_test.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/85/10685/1 diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index e83d91b..010c278 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -83,6 +83,7 @@ self._event_server = event_server self._event_server.register(self.handle_msg) self._unstarted = copy(self._mobiles) + self._started = [] def mobiles(self): return self._mobiles -- To view, visit https://gerrit.osmocom.org/10685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I675772c89e32620da5695aa4793b735cc266684c Gerrit-Change-Number: 10685 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 03:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 03:42:16 +0000 Subject: Change in osmo-gsm-tester[master]: Create a "ms_driver" stub for the testsuite Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10686 Change subject: Create a "ms_driver" stub for the testsuite ...................................................................... Create a "ms_driver" stub for the testsuite All config parameters are hardcoded for now and it should push subscribers into the test (which should be a base class but not a specific test). Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d --- A src/osmo_gsm_tester/ms_driver.py M src/osmo_gsm_tester/suite.py 2 files changed, 126 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/10686/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py new file mode 100644 index 0000000..d7b4d89 --- /dev/null +++ b/src/osmo_gsm_tester/ms_driver.py @@ -0,0 +1,122 @@ +# ms_driver: Launch OsmocomBB mobile's virtually connected to a BTS +# +# Copyright (C) 2018 by Holger Hans Peter Freyther +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from collections import namedtuple +from datetime import timedelta +from . import log +from osmo_ms_driver.cdf import cdfs +from osmo_ms_driver.event_server import EventServer +from osmo_ms_driver.simple_loop import SimpleLoop +from osmo_ms_driver.location_update_test import MassUpdateLocationTest + +import os.path +import tempfile + +class Subscriber(log.Origin): + def __init__(self, imsi, ki): + super().__init__(log.C_RUN, 'subscriber') + self._imsi = imsi + self._ki = ki + self._auth_algo = "comp128v1" + self._msisdn = None + + def msisdn(self): + return self._msisdn + + def set_msisdn(self, msisdn): + self._msisdn = msisdn + + def imsi(self): + return self._imsi + + def ki(self): + return self._ki + + def auth_algo(self): + return self._auth_algo + +class MsDriver(log.Origin): + + def __init__(self, suite_run): + super().__init__(log.C_RUN, 'ms-driver') + self._suite_run = suite_run + + # TODO: take config out of the test scenario + self._num_ms = 10 + self._time_start = timedelta(seconds=60) + self._time_step = timedelta(milliseconds=100) + self._test_duration = timedelta(seconds=120) + self._cdf = cdfs["ease_in_out"](self._time_start, self._time_step) + self._loop = SimpleLoop() + self._suite_run.remember_to_stop(self) + self._test_case = None + + def prepare(self): + """ + Prepares the subscribers, tests and registration server. Needs to be + called after the complete configuration of this driver. + """ + # TODO: That needs some re-factoring + tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver") + log.log("Going to store files in ", tmp_dir=tmp_dir) + event_server_path = os.path.join(tmp_dir, "osmo_ms_driver.unix") + + self._ev_server = EventServer("ev_server", event_server_path) + self._ev_server.listen(self._loop) + self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, tmp_dir) + self._suite_run.remember_to_stop(self) + + # TODO: We should pass subscribers down to the test and not get it from + # there. + self._subs = [Subscriber(imsi=mob.imsi(), ki=mob.ki()) for mob in self._test_case.mobiles()] + + + def ms_subscribers(self): + """ + Returns a list of 'subscribers' that were configured in the + current scenario. + """ + if not hasattr(self, '_subs'): + self.prepare() + return self._subs + + def run_test(self): + """ + Runs the configured tests by starting the configured amount of mobile + devices according to their schedule. Returns once all tests succeeded + or the configured timeout has passed. + """ + if not hasattr(self, '_subs'): + self.prepare() + self._test_case.run_test(self._loop, self._test_duration) + + def print_stats(self): + """ + Prints statistics about the test run. + """ + self._test_case.print_stats() + + def terminate(self): + """ + Stops the testcase and all launched processes. Called by the + suite. + """ + if not self._test_case: + return + self._test_case.stop_all() + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index fa86f96..161660a 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -23,7 +23,7 @@ import pprint from . import config, log, template, util, resource, schema, test from .event_loop import MainLoop -from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon +from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon, ms_driver class Timeout(Exception): pass @@ -307,6 +307,9 @@ ip_address = self.ip_address() return osmo_stp.OsmoStp(self, ip_address) + def ms_driver(self): + return ms_driver.MsDriver(self) + def bts(self, specifics=None): bts = bts_obj(self, self.reserved_resources.get(resource.R_BTS, specifics=specifics)) bts.set_lac(self.lac()) -- To view, visit https://gerrit.osmocom.org/10686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d Gerrit-Change-Number: 10686 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 03:42:16 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 03:42:16 +0000 Subject: Change in osmo-gsm-tester[master]: Add an initial test for the ms_driver Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10687 Change subject: Add an initial test for the ms_driver ...................................................................... Add an initial test for the ms_driver Some points to discuss: * Should modems==0 be allowed to be set? * I should compile/package the mobile and virtphy as well * When executing suites shall we have a way to select only the virtual/non-virtual ones? A different suites directory? Things to make configurable: * IMSI and matching MSISDN ranges (start + count) * Timeouts and number of MS (which should be related) Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 --- A suites/netreg_mass/register_default_mass.py A suites/netreg_mass/suite.conf 2 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/10687/1 diff --git a/suites/netreg_mass/register_default_mass.py b/suites/netreg_mass/register_default_mass.py new file mode 100644 index 0000000..ede2b74 --- /dev/null +++ b/suites/netreg_mass/register_default_mass.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python3 +""" +Run a network registration with a 'massive' amount of MS +using the ms_driver infrastructure. +""" +from osmo_gsm_tester.testenv import * + +print('use resources...') +nitb = suite.nitb() +bts = suite.bts() +ms_driver = suite.ms_driver() + +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() +bts.start() +wait(nitb.bts_is_connected, bts) + +# Configure all MS that the MS driver knows about. +for ms in ms_driver.ms_subscribers(): + nitb.subscriber_add(ms) + +# Run the base test. +ms_driver.run_test() + +# Print stats +ms_driver.print_stats() diff --git a/suites/netreg_mass/suite.conf b/suites/netreg_mass/suite.conf new file mode 100644 index 0000000..a1e1a68 --- /dev/null +++ b/suites/netreg_mass/suite.conf @@ -0,0 +1,11 @@ +resources: + ip_address: + - times: 1 + bts: + - times: 1 + # TODO: Be able to set the below to 0. + modem: + - times: 1 + +defaults: + timeout: 40s -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:05:44 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Aug 2018 07:05:44 +0000 Subject: Change in osmo-bts[master]: cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10655 ) Change subject: cosmetic: rename *_meas_rep_fn10* to *_meas_re_fn10*_by_*s ...................................................................... Patch Set 1: > Any reason of s/rep/re/? I think adding postfix would be enough. Just thought saving one char would be a good idea, but I also thing that rep makes it more clear. I have changed it now. -- To view, visit https://gerrit.osmocom.org/10655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Gerrit-Change-Number: 10655 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:05:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:06:02 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Aug 2018 07:06:02 +0000 Subject: Change in osmo-bts[master]: cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10655 to look at the new patch set (#2). Change subject: cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s ...................................................................... cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s The lookup table that control the measurement interval endings do not make clear what their indexes refer to. Lets give them more distinct names. rename sdcch8_meas_rep_fn102 to sdcch8_meas_rep_fn102_by_ss rename sdcch4_meas_rep_fn102 to sdcch4_meas_rep_fn102_by_ss rename tchf_meas_rep_fn104 to tchf_meas_rep_fn104_by_ts rename tchh0_meas_rep_fn104 to tchh0_meas_rep_fn104_by_ts rename tchh1_meas_rep_fn104 to tchh1_meas_rep_fn104_by_ts Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Related: OS#2975 --- M src/common/measurement.c 1 file changed, 16 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/10655/2 -- To view, visit https://gerrit.osmocom.org/10655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Gerrit-Change-Number: 10655 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:10:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:10:00 +0000 Subject: Change in osmo-bts[master]: measurement: fix is_meas_overdue() and increase testcoverage In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10654 ) Change subject: measurement: fix is_meas_overdue() and increase testcoverage ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d555a21003943bf720c53f3a611029ba45339a9 Gerrit-Change-Number: 10654 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 29 Aug 2018 07:10:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:10:34 +0000 Subject: Change in osmo-bts[master]: cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10655 ) Change subject: cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Gerrit-Change-Number: 10655 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:10:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:10:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:10:51 +0000 Subject: Change in osmo-bts[master]: cosmetic: test_is_meas_overdue() does not test is_meas_complete() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10666 ) Change subject: cosmetic: test_is_meas_overdue() does not test is_meas_complete() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b7aa2f7a7c75bc3eed0c94b6ef9d17e7e36ce96 Gerrit-Change-Number: 10666 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:10:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:11:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:11:20 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10618 ) Change subject: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 Gerrit-Change-Number: 10618 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 07:11:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:11:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:11:39 +0000 Subject: Change in osmo-bsc[master]: log: tweaks and more context in osmo_bsc_sigtran_send() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10642 ) Change subject: log: tweaks and more context in osmo_bsc_sigtran_send() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b Gerrit-Change-Number: 10642 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:11:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:11:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:11:46 +0000 Subject: Change in osmo-bsc[master]: log: tweaks and more context in osmo_bsc_sigtran_send() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10642 ) Change subject: log: tweaks and more context in osmo_bsc_sigtran_send() ...................................................................... log: tweaks and more context in osmo_bsc_sigtran_send() Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 96f0687..7b7d3b9 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -363,16 +363,18 @@ if (msg->len >= 3) { switch (msg->data[0]) { case BSSAP_MSG_BSS_MANAGEMENT: - LOGP(DMSC, LOGL_INFO, "Tx MSC %s\n", gsm0808_bssmap_name(msg->data[2])); + LOGP(DMSC, LOGL_INFO, "Tx MSC: BSSMAP: %s\n", + gsm0808_bssmap_name(msg->data[2])); break; case BSSAP_MSG_DTAP: - LOGP(DMSC, LOGL_INFO, "Tx MSC DTAP\n"); + LOGP(DMSC, LOGL_INFO, "Tx MSC: DTAP\n"); break; default: - LOGP(DMSC, LOGL_ERROR, "Tx MSC (unknwon message type)\n"); + LOGP(DMSC, LOGL_ERROR, "Tx MSC: unknown message type: 0x%x\n", + msg->data[0]); } } else - LOGP(DMSC, LOGL_ERROR, "Tx MSC (message too short)\n"); + LOGP(DMSC, LOGL_ERROR, "Tx MSC: message too short: %u\n", msg->len); if (a_reset_conn_ready(msc) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); -- To view, visit https://gerrit.osmocom.org/10642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3d51f17b0f6ceb0e5237b4d6d5252c701fc2fe6b Gerrit-Change-Number: 10642 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:11:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:11:49 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10618 ) Change subject: OsmoMGW: document the 'X-Osmo-IGN' MGCP extension ...................................................................... OsmoMGW: document the 'X-Osmo-IGN' MGCP extension See also Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c in osmo-mgw.git, which changes the initial single-character implementation to match this specification of string tokens separated by spaces. Change-Id: If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 --- A OsmoMGW/chapters/mgcp_extensions.adoc M OsmoMGW/osmomgw-usermanual.adoc 2 files changed, 70 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoMGW/chapters/mgcp_extensions.adoc b/OsmoMGW/chapters/mgcp_extensions.adoc new file mode 100644 index 0000000..86ff643 --- /dev/null +++ b/OsmoMGW/chapters/mgcp_extensions.adoc @@ -0,0 +1,68 @@ +== MGCP Extensions + +The MGCP protocol is extendable. The following non-standard extensions are +understood by OsmoMGW. + +=== `X-Osmo-IGN` + +`X-Osmo-IGN` indicates to OsmoMGW that specific items of an endpoint should be +ignored, so that it is lenient on mismatching values that would normally +indicate collisions or configuration errors. + +==== `X-Osmo-IGN` Format + +The value part of X-Osmo-IGN must be one or more items separated by one or more +spaces. Each item consists of one or more non-whitespace characters. + +.Example: `X-Osmo-IGN` format with three ficticious items "X", "abc" and "123". +---- +X-Osmo-IGN: X abc 123 +---- + +`X-Osmo-IGN` must be issued in the MGCP section (typically as its last item), +before the SDP section starts. + +==== Supported `X-Osmo-IGN` Items + +Currently, the following `X-Osmo-IGN` items are supported: + +* `C`: ignore CallID mismatches, i.e. differing "C" values between connections + on the same endpoint. + +.Note: +`X-Osmo-IGN` does not support ignoring mismatches on the domain part of +an endpoint name, e.g. ignoring a mismatch on "example.com" in +`rtpbridge/123abc at example.com`. Instead, you may globally configure OsmoMGW +with `mgcp` / `domain *` to permit all domain parts. + +===== `X-Osmo-IGN: C` + +By default, OsmoMGW verifies that all CallIDs ("C" values) match for all +connections on any one given endpoint. To ignore CallID mismatches, pass a `C` +in the `X-Osmo-IGN` header, for the first or the second `CRCX` on an endpoint. +When the `X-Osmo-IGN: C` is sent for any one `CRCX` on an endpoint, CallID +mismatches will be ignored for that and all subsequent messages for that +endpoint. Hence this header only needs to be included once per endpoint, in any +`CRCX` message that precedes or coincides with a CallID mismatch. + +This is particularly useful for a BSC that is connected to an A/SCCPlite MSC, +where the BSC and MSC each are expected to configure their respective own +connection on a shared endpoint. For A/SCCPlite, it is impossible for the BSC +to know the CallID that the MSC will use, so CallID mismatches are inevitable. +See also OsmoBSC, which will by default pass the `X-Osmo-IGN: C` header for +endpoints associated with an A/SCCPlite MSC. + +.Example: `CRCX` message that instructs OsmoMGW to ignore CallID mismatches +---- +CRCX 2 rtpbridge/123abc at mgw MGCP 1.0 +M: recvonly +C: 2 +L: p:20 +X-Osmo-IGN: C + +v=0 +c=IN IP4 123.12.12.123 +m=audio 5904 RTP/AVP 97 +a=rtpmap:97 GSM-EFR/8000 +a=ptime:40 +---- diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc index 69dc005..6030023 100644 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ b/OsmoMGW/osmomgw-usermanual.adoc @@ -18,6 +18,8 @@ include::chapters/configuration.adoc[] +include::chapters/mgcp_extensions.adoc[] + //include::chapters/counters.adoc[] include::../common/chapters/port_numbers.adoc[] -- To view, visit https://gerrit.osmocom.org/10618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 Gerrit-Change-Number: 10618 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:14:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:14:12 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: fix log of conn_id presence In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10674 ) Change subject: mgcp_test: fix log of conn_id presence ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcd731b9daf618b97d8f7e6a776266071cd29e08 Gerrit-Change-Number: 10674 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:14:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:15:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:15:02 +0000 Subject: Change in osmo-mgw[master]: cosmetic: mgcp_test: fix get_conn_id_from_response() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10679 ) Change subject: cosmetic: mgcp_test: fix get_conn_id_from_response() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b Gerrit-Change-Number: 10679 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:15:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:15:22 +0000 Subject: Change in osmo-mgw[master]: comment: indicate struct type for mgcp_endpoint.conns In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10680 ) Change subject: comment: indicate struct type for mgcp_endpoint.conns ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia65359c22da3e7b28e3f23b36446ca434ca0be8c Gerrit-Change-Number: 10680 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:15:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:16:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:16:40 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): compare conn Id ('I:') case insensitively In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10677 ) Change subject: mgcp_conn_get(): compare conn Id ('I:') case insensitively ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e52278c3abe9e9c8c848c2b1538bce443f68a43 Gerrit-Change-Number: 10677 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:16:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:17:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:17:23 +0000 Subject: Change in osmo-mgw[master]: mgcp_conn_get(): match conn Id ('I:') despite leading zeros In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10678 ) Change subject: mgcp_conn_get(): match conn Id ('I:') despite leading zeros ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91 Gerrit-Change-Number: 10678 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:17:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:22:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:22:47 +0000 Subject: Change in osmo-mgw[master]: generate shorter 'I:' conn IDs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10676 ) Change subject: generate shorter 'I:' conn IDs ...................................................................... Patch Set 1: Code-Review-1 I thik we have to be careful here not to damage our OsmoMGW implementation at the sake of interoperability with one broken call agent implementation. OsmoMGW should continue to support CallIDs of up to 32 hex digits, as in the RFC. However, libosmo-mgscp-client (and hence OsmoBSC) can simply use shorter CallIDs, which then ends up being compatible with that 3rd party MSC, right? Changing a common definition shared between our CA and MGW implementations would render our MGW also spec-incompliant... -- To view, visit https://gerrit.osmocom.org/10676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia290c22a91fca0e5aa44515fca6df00064aff100 Gerrit-Change-Number: 10676 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:22:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:23:15 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: fix get_conn_id_from_response() CI length In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10675 ) Change subject: mgcp_test: fix get_conn_id_from_response() CI length ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I762c273bac172acb6d0aae6ea6267603ab654cbf Gerrit-Change-Number: 10675 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:23:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:24:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:24:07 +0000 Subject: Change in simtrace2[master]: set main clock for using UART at 921600 bps In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10668 ) Change subject: set main clock for using UART at 921600 bps ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4a97fc68494c93b9d128503515d88049de506c Gerrit-Change-Number: 10668 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:24:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:24:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:24:51 +0000 Subject: Change in simtrace2[master]: stdio: add void 'l' format string qualifier In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10670 ) Change subject: stdio: add void 'l' format string qualifier ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib506a66f68712c6b3eeb5129a39abf47ec86a2a7 Gerrit-Change-Number: 10670 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:24:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:25:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:25:42 +0000 Subject: Change in simtrace2[master]: UART: switch baud rate to 921600 bps In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10669 ) Change subject: UART: switch baud rate to 921600 bps ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82b74f697342d580ccb79ada4715f35f4e8cca86 Gerrit-Change-Number: 10669 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:25:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:26:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:26:51 +0000 Subject: Change in simtrace2[master]: stdio: fix detection of malformated format strings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10671 ) Change subject: stdio: fix detection of malformated format strings ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10671/1/firmware/libcommon/source/stdio.c File firmware/libcommon/source/stdio.c: https://gerrit.osmocom.org/#/c/10671/1/firmware/libcommon/source/stdio.c at 405 PS1, Line 405: return rc; are you sure you don't want to close the va_list with va_end() in this case? This seems odd to me, but I'm not a varargs expert... -- To view, visit https://gerrit.osmocom.org/10671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8506b05d56da55d1357a1234917adf341b46e1db Gerrit-Change-Number: 10671 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 29 Aug 2018 07:26:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:27:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:27:00 +0000 Subject: Change in simtrace2[master]: DFU: fix Wformat compile warning In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10672 ) Change subject: DFU: fix Wformat compile warning ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8c422d8a709f8311c40d37e1f1f01dcd3a199b6f Gerrit-Change-Number: 10672 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:27:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:27:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:27:18 +0000 Subject: Change in simtrace2[master]: qmod: output EEPROM data only on debug level, and add completion output In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10673 ) Change subject: qmod: output EEPROM data only on debug level, and add completion output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8d3cbd01d0e34432d424355f4fafb24bc5273a1 Gerrit-Change-Number: 10673 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:27:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:27:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:27:46 +0000 Subject: Change in simtrace2[master]: set main clock for using UART at 921600 bps In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10668 ) Change subject: set main clock for using UART at 921600 bps ...................................................................... set main clock for using UART at 921600 bps UART baud rate is main clock (MCK) divided by CR*16. The MCK values are chosen >= 48 MHz and <= 64 MHz to have a near integer value CR for a baud rate of 921600 bps. The end MCK frequency between simtrace and qmod differ slightly but are close to 58 MHz. Change-Id: Iaa4a97fc68494c93b9d128503515d88049de506c --- M firmware/libboard/common/include/board_common.h M firmware/libboard/common/source/board_lowlevel.c M firmware/libboard/owhw/include/board.h M firmware/libboard/qmod/include/board.h M firmware/libboard/simtrace/include/board.h 5 files changed, 31 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 1b29680..db030ad 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -53,8 +53,6 @@ /** Core definition */ #define cortexm3 -#define BOARD_MCK 48000000 - #define PIO_LED_RED PIO_PA17 #define PIO_LED_GREEN PIO_PA18 diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index b82f6f3..2be6134 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.c @@ -46,39 +46,39 @@ #define BOARD_OSCOUNT (CKGR_MOR_MOSCXTST(0x8)) #define BOARD_MCKR (PMC_MCKR_PRES_CLK | PMC_MCKR_CSS_PLLA_CLK) -#if (BOARD_MCK == 48000000) -#if (BOARD_MAINOSC == 18432000) -/* Clock settings at 48MHz for 18 MHz crystal */ -#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ - | CKGR_PLLAR_MULA(13-1) \ - | CKGR_PLLAR_PLLACOUNT(0x1) \ - | CKGR_PLLAR_DIVA(5)) -#elif (BOARD_MAINOSC == 12000000) -/* QMod has 12 MHz clock, so multply by 8 (96 MHz) and divide by 2 */ +/** configure PLL to generate main clock based on main oscillator frequency */ +#if (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 48000000) #define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ | CKGR_PLLAR_MULA(8-1) \ | CKGR_PLLAR_PLLACOUNT(0x1) \ | CKGR_PLLAR_DIVA(2)) -#else -#error "Please define PLLA config for your MAINOSC frequency" -#endif /* MAINOSC */ -#elif (BOARD_MCK == 64000000) -#if (BOARD_MAINOSC == 18432000) -/* Clock settings at 64MHz for 18 MHz crystal: 64.512 MHz */ +#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 58000000) #define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ - | CKGR_PLLAR_MULA(7-1) \ + | CKGR_PLLAR_MULA(29-1) \ | CKGR_PLLAR_PLLACOUNT(0x1) \ - | CKGR_PLLAR_DIVA(2)) -#elif (BOARD_MAINOSC == 12000000) -/* QMod has 12 MHz clock, so multply by 10 / div by 2: 60 MHz */ + | CKGR_PLLAR_DIVA(6)) +#elif (BOARD_MAINOSC == 12000000) && (BOARD_MCK == 60000000) #define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ | CKGR_PLLAR_MULA(10-1) \ | CKGR_PLLAR_PLLACOUNT(0x1) \ | CKGR_PLLAR_DIVA(2)) -#error "Please define PLLA config for your MAINOSC frequency" -#endif /* MAINOSC */ +#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 47923200) +#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ + | CKGR_PLLAR_MULA(13-1) \ + | CKGR_PLLAR_PLLACOUNT(0x1) \ + | CKGR_PLLAR_DIVA(5)) +#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 58982400) +#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ + | CKGR_PLLAR_MULA(16-1) \ + | CKGR_PLLAR_PLLACOUNT(0x1) \ + | CKGR_PLLAR_DIVA(5)) +#elif (BOARD_MAINOSC == 18432000) && (BOARD_MCK == 64512000) +#define BOARD_PLLAR (CKGR_PLLAR_STUCKTO1 \ + | CKGR_PLLAR_MULA(7-1) \ + | CKGR_PLLAR_PLLACOUNT(0x1) \ + | CKGR_PLLAR_DIVA(2)) #else - #error "No PLL settings for current BOARD_MCK." + #error "Please define PLLA config for your BOARD_MCK/MAINOSC frequency" #endif #if (BOARD_MAINOSC == 12000000) diff --git a/firmware/libboard/owhw/include/board.h b/firmware/libboard/owhw/include/board.h index be6bb17..401fb73 100644 --- a/firmware/libboard/owhw/include/board.h +++ b/firmware/libboard/owhw/include/board.h @@ -25,7 +25,10 @@ /** Board definition */ #define owhw +/** oscillator used as main clock source (in Hz) */ #define BOARD_MAINOSC 18432000 +/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ +#define BOARD_MCK 58982400 // 18.432 * 16 / 5 /* USIM 2 interface (USART) */ #define PIN_USIM2_CLK {PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT} diff --git a/firmware/libboard/qmod/include/board.h b/firmware/libboard/qmod/include/board.h index c23ad50..a738daa 100644 --- a/firmware/libboard/qmod/include/board.h +++ b/firmware/libboard/qmod/include/board.h @@ -28,7 +28,10 @@ /** Board definition */ #define qmod +/** oscillator used as main clock source (in Hz) */ #define BOARD_MAINOSC 12000000 +/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ +#define BOARD_MCK 58000000 // 18.432 * 29 / 6 /* USIM 2 interface (USART) */ #define PIN_USIM2_CLK {PIO_PA2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT} diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index 6751863..0c1e533 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -26,8 +26,10 @@ /* Board definition */ #define simtrace -/* Board main oscillator frequency (in Hz) */ +/** oscillator used as main clock source (in Hz) */ #define BOARD_MAINOSC 18432000 +/** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ +#define BOARD_MCK 58982400 // 18.432 * 16 / 5 /** Pin configuration **/ /* Button to force bootloader start (shorted to ground when pressed */ -- To view, visit https://gerrit.osmocom.org/10668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa4a97fc68494c93b9d128503515d88049de506c Gerrit-Change-Number: 10668 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:27:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:27:46 +0000 Subject: Change in simtrace2[master]: UART: switch baud rate to 921600 bps In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10669 ) Change subject: UART: switch baud rate to 921600 bps ...................................................................... UART: switch baud rate to 921600 bps the higher baud rate allows for more debugging (without dropping data) and is well supported by USB for UART adapters (this standard baud rate is 8 x 115200). the closest matching integer value is calculated for UART CR. no floating point calculation can be used since this would increase the size of the resulting binary by ~ 2kB (for the softfp). this is not possible for the DFU since it already is close to the maximum size of 16 kB. Change-Id: I82b74f697342d580ccb79ada4715f35f4e8cca86 --- M firmware/libboard/common/include/board_common.h M firmware/libboard/common/source/uart_console.c 2 files changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index db030ad..1155158 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -77,8 +77,8 @@ #define PINS_UART { PIO_PA9A_URXD0|PIO_PA10A_UTXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT} /** UART0 */ -/** Console baudrate always using 115200. */ -#define CONSOLE_BAUDRATE 115200 +/** Console baud rate in bps */ +#define CONSOLE_BAUDRATE 921600 /** UART peripheral used by the console (UART0). */ #define CONSOLE_UART UART0 /** UART peripheral ID used by the console (UART0). */ diff --git a/firmware/libboard/common/source/uart_console.c b/firmware/libboard/common/source/uart_console.c index 3a00e49..bcfb0b7 100644 --- a/firmware/libboard/common/source/uart_console.c +++ b/firmware/libboard/common/source/uart_console.c @@ -85,7 +85,12 @@ /* Configure baudrate */ /* Asynchronous, no oversampling */ - pUart->UART_BRGR = (masterClock / baudrate) / 16; + //pUart->UART_BRGR = (masterClock / baudrate) / 16; + if ((masterClock / baudrate) % 16 >= 7) { + pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 1; + } else { + pUart->UART_BRGR = ( masterClock / baudrate) / 16 + 0; + } /* Disable PDC channel */ pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS; -- To view, visit https://gerrit.osmocom.org/10669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I82b74f697342d580ccb79ada4715f35f4e8cca86 Gerrit-Change-Number: 10669 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:27:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:27:57 +0000 Subject: Change in simtrace2[master]: stdio: add void 'l' format string qualifier In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10670 ) Change subject: stdio: add void 'l' format string qualifier ...................................................................... stdio: add void 'l' format string qualifier Wformat requires uint32_t to be used in format string with the 'l' qualifier (l = long = at least 32 bits). this qualifier was not handled before. since on ARM 32-bit int == long we can simply ignore it (stdio already does not support 64-bit data). Change-Id: Ib506a66f68712c6b3eeb5129a39abf47ec86a2a7 --- M firmware/libcommon/source/stdio.c 1 file changed, 16 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/firmware/libcommon/source/stdio.c b/firmware/libcommon/source/stdio.c index 04d73f0..2bfaed7 100644 --- a/firmware/libcommon/source/stdio.c +++ b/firmware/libcommon/source/stdio.c @@ -350,19 +350,22 @@ } // Parse type - switch (*pFormat) { - case 'd': - case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break; - case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break; - case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break; - case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break; - case 's': num = PutString(pStr, va_arg(ap, char *)); break; - case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break; - default: - return EOF; - } - - pFormat++; + do { + num = 0; + switch (*pFormat) { + case 'l': num = -1; break; // ignore long qualifier since int == long (and long long is not supported) + case 'd': + case 'i': num = PutSignedInt(pStr, fill, width, va_arg(ap, signed int)); break; + case 'u': num = PutUnsignedInt(pStr, fill, width, va_arg(ap, unsigned int)); break; + case 'x': num = PutHexa(pStr, fill, width, 0, va_arg(ap, unsigned int)); break; + case 'X': num = PutHexa(pStr, fill, width, 1, va_arg(ap, unsigned int)); break; + case 's': num = PutString(pStr, va_arg(ap, char *)); break; + case 'c': num = PutChar(pStr, va_arg(ap, unsigned int)); break; + default: + return EOF; + } + pFormat++; + } while (num < 0); pStr += num; size += num; } -- To view, visit https://gerrit.osmocom.org/10670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib506a66f68712c6b3eeb5129a39abf47ec86a2a7 Gerrit-Change-Number: 10670 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:28:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:28:34 +0000 Subject: Change in osmo-gsm-tester[master]: suite: Fix generation of config() dictionary In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10624 ) Change subject: suite: Fix generation of config() dictionary ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e Gerrit-Change-Number: 10624 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:28:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:28:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:28:53 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc: Parametrize codec-list VTY cfg In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10621 ) Change subject: osmo-bsc: Parametrize codec-list VTY cfg ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 Gerrit-Change-Number: 10621 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 07:28:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:29:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:29:08 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add suites testing different codecs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10625 ) Change subject: default-suites: Add suites testing different codecs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I591c71c66c5bbcd07466fe1d433aa87aed964fbe Gerrit-Change-Number: 10625 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:29:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:29:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:29:22 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove octobts tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10626 ) Change subject: default-suites: Remove octobts tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I828723193564b3a91aeac0c163c7c8c6b7e4058c Gerrit-Change-Number: 10626 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:29:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:29:26 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 29 Aug 2018 07:29:26 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_client_read In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10656 ) Change subject: ipa: Simplify code in ipa_client_read ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3 Gerrit-Change-Number: 10656 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:29:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:30:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 29 Aug 2018 07:30:05 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_server_conn_read In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10657 ) Change subject: ipa: Simplify code in ipa_server_conn_read ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bce9f92209cc2fb37b78792e34f7898c71d2327 Gerrit-Change-Number: 10657 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:30:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:31:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:31:35 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10667 ) Change subject: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 Gerrit-Change-Number: 10667 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:31:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:31:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:31:51 +0000 Subject: Change in osmo-gsm-tester[master]: Check for smpplib being installed as well In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10681 ) Change subject: Check for smpplib being installed as well ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6be1c961e512e68d5bed8b317d1dda363a58fbe7 Gerrit-Change-Number: 10681 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:31:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:32:21 +0000 Subject: Change in osmo-gsm-tester[master]: Generate imsi/ki on OsmoMobile construction In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10682 ) Change subject: Generate imsi/ki on OsmoMobile construction ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b Gerrit-Change-Number: 10682 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:32:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:32:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:32:34 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10683 ) Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:32:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:32:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:32:59 +0000 Subject: Change in osmo-gsm-tester[master]: Keep track of all mobiles and copy them to unstarted later In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10684 ) Change subject: Keep track of all mobiles and copy them to unstarted later ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 Gerrit-Change-Number: 10684 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:32:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:33:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:33:08 +0000 Subject: Change in osmo-gsm-tester[master]: Always initialize the _started in the test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10685 ) Change subject: Always initialize the _started in the test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I675772c89e32620da5695aa4793b735cc266684c Gerrit-Change-Number: 10685 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:33:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:35:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:35:55 +0000 Subject: Change in osmo-bts[master]: measurement: add unit tests for is_meas_complete() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10663 ) Change subject: measurement: add unit tests for is_meas_complete() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8f89d9e7092cd65ba4d5c5649140692dcc20bdd6 Gerrit-Change-Number: 10663 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:35:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:35:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:35:57 +0000 Subject: Change in osmo-bts[master]: measurement: add unit tests for is_meas_complete() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10663 ) Change subject: measurement: add unit tests for is_meas_complete() ...................................................................... measurement: add unit tests for is_meas_complete() We do not test is_meas_complete() individually yet, but it is an integral part of the measurement processings since this function decides where a measurement interval ends. - Add unit tests that test TCH/F, TCH/H, SDCCH/4 and STDCH/8 Change-Id: I8f89d9e7092cd65ba4d5c5649140692dcc20bdd6 Related: OS#2987 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 4 files changed, 187 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 57eeef5..5c3def0 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -12,6 +12,8 @@ void lchan_meas_reset(struct gsm_lchan *lchan); +int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn); + bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn); #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index cb45e6e..158849d 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -244,8 +244,10 @@ return 0; } -/* determine if a measurement period ends at the given frame number */ -static int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn) +/* determine if a measurement period ends at the given frame number + * (this function is only used internally, it is public to call it from + * unit-tests) */ +int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn) { unsigned int fn_mod = -1; const uint8_t *tbl; diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index ec89df9..0166771 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -484,6 +484,182 @@ OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); } +static void test_is_meas_complete_single(struct gsm_lchan *lchan, + uint32_t fn_end, uint8_t intv_len) +{ + unsigned int i; + unsigned int k; + int rc; + uint32_t offset; + + /* Walk through multiple measurement intervals and make sure that the + * interval end is detected only in the expected location */ + for (k = 0; k < 100; k++) { + offset = intv_len * k; + for (i = 0; i < intv_len; i++) { + rc = is_meas_complete(lchan, i + offset); + if (rc) + OSMO_ASSERT(i + offset == fn_end + offset); + } + } +} + +static void test_is_meas_complete(void) +{ + struct gsm_lchan *lchan; + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing is_meas_complete()\n"); + + /* Test interval end detection on TCH/F TS0-TS7 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 12, 104); + + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 25, 104); + + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 38, 104); + + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 51, 104); + + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 64, 104); + + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 77, 104); + + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 90, 104); + + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + test_is_meas_complete_single(lchan, 103, 104); + + /* Test interval end detection on TCH/H TS0-TS7 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 12, 104); + + lchan = &trx->ts[1].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 12, 104); + + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 25, 104); + + lchan = &trx->ts[1].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 25, 104); + + lchan = &trx->ts[2].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 38, 104); + + lchan = &trx->ts[3].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 38, 104); + + lchan = &trx->ts[2].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 51, 104); + + lchan = &trx->ts[3].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 51, 104); + + lchan = &trx->ts[4].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 64, 104); + + lchan = &trx->ts[5].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 64, 104); + + lchan = &trx->ts[4].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 77, 104); + + lchan = &trx->ts[5].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 77, 104); + + lchan = &trx->ts[6].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 90, 104); + + lchan = &trx->ts[7].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 90, 104); + + lchan = &trx->ts[6].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 103, 104); + + lchan = &trx->ts[7].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + test_is_meas_complete_single(lchan, 103, 104); + + /* Test interval end detection on SDCCH/8 SS0-SS7 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 66, 102); + + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 70, 102); + + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 74, 102); + + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 78, 102); + + lchan = &trx->ts[0].lchan[4]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 98, 102); + + lchan = &trx->ts[0].lchan[5]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 0, 102); + + lchan = &trx->ts[0].lchan[6]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 4, 102); + + lchan = &trx->ts[0].lchan[7]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + test_is_meas_complete_single(lchan, 8, 102); + + /* Test interval end detection on SDCCH/4 SS0-SS3 */ + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 88, 102); + + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 92, 102); + + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 6, 102); + + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + test_is_meas_complete_single(lchan, 10, 102); +} + /* This tests the robustness of lchan_meas_process_measurement(). This is the * function that is called from l1_sap.c each time a measurement indication is * received. The process must still go on when measurement indications (blocks) @@ -604,6 +780,7 @@ printf("***************************************************\n"); test_is_meas_overdue(); + test_is_meas_complete(); test_lchan_meas_process_measurement(false, false); test_lchan_meas_process_measurement(true, false); test_lchan_meas_process_measurement(false, true); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 77b652e..d8f8174 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -584,6 +584,10 @@ =========================================================== +Testing is_meas_complete() + + +=========================================================== Testing lchan_meas_process_measurement() (leaving out measurement sample for SACCH block) (leaving out measurement sample for SACCH block) -- To view, visit https://gerrit.osmocom.org/10663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8f89d9e7092cd65ba4d5c5649140692dcc20bdd6 Gerrit-Change-Number: 10663 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:36:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:36:16 +0000 Subject: Change in osmo-trx[master]: vty: Fix typo in gpsdo clock reference type In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10627 ) Change subject: vty: Fix typo in gpsdo clock reference type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f553c2cec9689524728cacb15b7daaff8166925 Gerrit-Change-Number: 10627 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:36:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:36:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:36:18 +0000 Subject: Change in osmo-trx[master]: vty: Fix typo in gpsdo clock reference type In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10627 ) Change subject: vty: Fix typo in gpsdo clock reference type ...................................................................... vty: Fix typo in gpsdo clock reference type Change-Id: I3f553c2cec9689524728cacb15b7daaff8166925 --- M CommonLibs/trx_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index baa26c8..45b58eb 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -39,7 +39,7 @@ static const struct value_string clock_ref_names[] = { { REF_INTERNAL, "internal" }, { REF_EXTERNAL, "external" }, - { REF_GPS, "gspdo" }, + { REF_GPS, "gpsdo" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/10627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3f553c2cec9689524728cacb15b7daaff8166925 Gerrit-Change-Number: 10627 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:38:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:38:08 +0000 Subject: Change in libosmocore[master]: properly handle mandatory cli param of gsm0808_create_paging2 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10650 ) Change subject: properly handle mandatory cli param of gsm0808_create_paging2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3716f9d5b210e0a7e6f45c9fe3fc34024e5234ad Gerrit-Change-Number: 10650 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:38:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:38:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:38:11 +0000 Subject: Change in libosmocore[master]: properly handle mandatory cli param of gsm0808_create_paging2 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10650 ) Change subject: properly handle mandatory cli param of gsm0808_create_paging2 ...................................................................... properly handle mandatory cli param of gsm0808_create_paging2 The cell identifier list parameter is mandatory. Document it as such, and tweak code which treated it like an optional parameter. No functional change. The existing code already asserts that a non-NULL value is passed for this parameter. Change-Id: I3716f9d5b210e0a7e6f45c9fe3fc34024e5234ad Related: OS#3021 --- M src/gsm/gsm0808.c 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 8c2d143..e3b10d0 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -588,7 +588,7 @@ /*! Create BSSMAP PAGING message * \param[in] imsi Mandatory paged IMSI in string representation * \param[in] tmsi Optional paged TMSI - * \param[in] cil Cell Identity List (where to page) + * \param[in] cil Mandatory Cell Identity List (where to page) * \param[in] chan_needed Channel Type needed * \returns callee-allocated msgb with BSSMAP PAGING message */ struct msgb *gsm0808_create_paging2(const char *imsi, const uint32_t *tmsi, @@ -615,7 +615,7 @@ /* Message Type 3.2.2.1 */ msgb_v_put(msg, BSS_MAP_MSG_PAGING); - /* IMSI 3.2.2.6 */ + /* mandatory IMSI 3.2.2.6 */ mid_len = gsm48_generate_mid_from_imsi(mid_buf, imsi); msgb_tlv_put(msg, GSM0808_IE_IMSI, mid_len - 2, mid_buf + 2); @@ -626,9 +626,8 @@ (uint8_t *) & tmsi_sw); } - /* Cell Identifier List 3.2.2.27 */ - if (cil) - gsm0808_enc_cell_id_list2(msg, cil); + /* mandatory Cell Identifier List 3.2.2.27 */ + gsm0808_enc_cell_id_list2(msg, cil); /* Channel Needed 3.2.2.36 */ if (chan_needed) { -- To view, visit https://gerrit.osmocom.org/10650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3716f9d5b210e0a7e6f45c9fe3fc34024e5234ad Gerrit-Change-Number: 10650 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:38:59 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log RTP IP in dotted quad format. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10490 ) Change subject: Logging: Log RTP IP in dotted quad format. ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 29 Aug 2018 07:38:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:39:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:39:00 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log RTP IP in dotted quad format. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10490 ) Change subject: Logging: Log RTP IP in dotted quad format. ...................................................................... Logging: Log RTP IP in dotted quad format. in check_rtp_create() log the IP address in human readable dotted quad format. Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 --- M src/mncc.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index b2c4abb..2ecf8d0 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -380,9 +380,10 @@ leg->base.payload_msg_type = rtp->payload_msg_type; /* TODO.. now we can continue with the call */ + struct in_addr net = { .s_addr = htonl(leg->base.ip) }; LOGP(DMNCC, LOGL_DEBUG, - "RTP cnt leg(%u) ip(%u), port(%u) pt(%u) ptm(%u)\n", - leg->callref, leg->base.ip, leg->base.port, + "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", + leg->callref, inet_ntoa(net), leg->base.port, leg->base.payload_type, leg->base.payload_msg_type); stop_cmd_timer(leg, MNCC_RTP_CREATE); continue_call(leg); -- To view, visit https://gerrit.osmocom.org/10490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I298b13836cc6b9c5888f931deca61132d31da035 Gerrit-Change-Number: 10490 Gerrit-PatchSet: 5 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:39:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:39:15 +0000 Subject: Change in osmo-sip-connector[master]: Use htonl, not ntohl before inet_ntoa() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10646 ) Change subject: Use htonl, not ntohl before inet_ntoa() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I805864759c287ad4e1d74e5f6ee16bf2d6a1b01f Gerrit-Change-Number: 10646 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 29 Aug 2018 07:39:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:39:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:39:18 +0000 Subject: Change in osmo-sip-connector[master]: Use htonl, not ntohl before inet_ntoa() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10646 ) Change subject: Use htonl, not ntohl before inet_ntoa() ...................................................................... Use htonl, not ntohl before inet_ntoa() Change-Id: I805864759c287ad4e1d74e5f6ee16bf2d6a1b01f --- M src/sdp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/sdp.c b/src/sdp.c index 213e979..17eb577 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -165,7 +165,7 @@ char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other) { - struct in_addr net = { .s_addr = ntohl(other->ip) }; + struct in_addr net = { .s_addr = htonl(other->ip) }; char *fmtp_str = NULL, *sdp; leg->wanted_codec = app_media_name(other->payload_msg_type); -- To view, visit https://gerrit.osmocom.org/10646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I805864759c287ad4e1d74e5f6ee16bf2d6a1b01f Gerrit-Change-Number: 10646 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:39:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:39:53 +0000 Subject: Change in libosmocore[master]: Properly deal with sockaddr_un socket path length limitations. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10648 ) Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016 Gerrit-Change-Number: 10648 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 29 Aug 2018 07:39:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:39:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:39:58 +0000 Subject: Change in libosmocore[master]: Properly deal with sockaddr_un socket path length limitations. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10648 ) Change subject: Properly deal with sockaddr_un socket path length limitations. ...................................................................... Properly deal with sockaddr_un socket path length limitations. In osmo_sock_unix_init(), add support for non-NUL-terminated unix socket paths and return an error if the supplied socket path exceeds the maximum socket path length supported by the operating system. Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016 Related: OS#2673 --- M src/socket.c 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/socket.c b/src/socket.c index 7e7f6d9..6f56efb 100644 --- a/src/socket.c +++ b/src/socket.c @@ -605,22 +605,29 @@ struct sockaddr_un local; int sfd, rc, on = 1; unsigned int namelen; + const size_t socket_path_len = strlen(socket_path); if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) return -EINVAL; local.sun_family = AF_UNIX; - osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)); + if (socket_path_len == sizeof(local.sun_path)) { + /* Handle corner-case where sun_path is not NUL-terminated. See the unix(7) man page. */ + memcpy(local.sun_path, socket_path, sizeof(local.sun_path)); + } else if (osmo_strlcpy(local.sun_path, socket_path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { + LOGP(DLGLOBAL, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", + sizeof(local.sun_path), socket_path); + return -ENOSPC; + } #if defined(BSD44SOCKETS) || defined(__UNIXWARE__) - local.sun_len = strlen(local.sun_path); + local.sun_len = socket_path_len; #endif #if defined(BSD44SOCKETS) || defined(SUN_LEN) namelen = SUN_LEN(&local); #else - namelen = strlen(local.sun_path) + - offsetof(struct sockaddr_un, sun_path); + namelen = socket_path_len + offsetof(struct sockaddr_un, sun_path); #endif sfd = socket(AF_UNIX, type, proto); -- To view, visit https://gerrit.osmocom.org/10648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I19d935e5e3dd7928e6e153c6f5ad7044de726016 Gerrit-Change-Number: 10648 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:41:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:41:16 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_client_read In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10656 ) Change subject: ipa: Simplify code in ipa_client_read ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3 Gerrit-Change-Number: 10656 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:41:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:41:36 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_server_conn_read In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10657 ) Change subject: ipa: Simplify code in ipa_server_conn_read ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5bce9f92209cc2fb37b78792e34f7898c71d2327 Gerrit-Change-Number: 10657 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 07:41:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:10 +0000 Subject: Change in libosmo-abis[master]: ipa: Allow signalling fd destroyed in ipa_client_read In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10658 ) Change subject: ipa: Allow signalling fd destroyed in ipa_client_read ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1 Gerrit-Change-Number: 10658 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:42:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:24 +0000 Subject: Change in libosmo-abis[master]: ipa: Allow signalling fd destroyed in ipa_server_conn_read In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10659 ) Change subject: ipa: Allow signalling fd destroyed in ipa_server_conn_read ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b968b72285f23a9552519cea67398a43d5003d2 Gerrit-Change-Number: 10659 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:42:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:34 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10660 ) Change subject: ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I961b0ef7e598a09ce48a83038c0d90a415e0e11c Gerrit-Change-Number: 10660 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:42:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:49 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Allow passing return code in e1inp_line_ops->sign_link() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10661 ) Change subject: ipaccess: Allow passing return code in e1inp_line_ops->sign_link() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia83eead3622d86f55c1dc5e91acc78dde73a0367 Gerrit-Change-Number: 10661 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 07:42:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:50 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_client_read In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10656 ) Change subject: ipa: Simplify code in ipa_client_read ...................................................................... ipa: Simplify code in ipa_client_read By doing this change we remove a duplicated error code path and thus avoid having to maintain an extra code path with function pointers. Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3 --- M src/input/ipa.c 1 file changed, 4 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/input/ipa.c b/src/input/ipa.c index 995d2c3..26bf170 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -56,17 +56,13 @@ LOGIPA(link, LOGL_DEBUG, "message received\n"); ret = ipa_msg_recv_buffered(ofd->fd, &msg, &link->pending_msg); - if (ret < 0) { + if (ret <= 0) { if (ret == -EAGAIN) return; - if (ret == -EPIPE || ret == -ECONNRESET) + else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(link, LOGL_ERROR, "lost connection with server\n"); - ipa_client_conn_close(link); - if (link->updown_cb) - link->updown_cb(link, 0); - return; - } else if (ret == 0) { - LOGIPA(link, LOGL_ERROR, "connection closed with server\n"); + else if (ret == 0) + LOGIPA(link, LOGL_ERROR, "connection closed with server\n"); ipa_client_conn_close(link); if (link->updown_cb) link->updown_cb(link, 0); -- To view, visit https://gerrit.osmocom.org/10656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic044894980ae2b882d99eb30d9df50066671d8f3 Gerrit-Change-Number: 10656 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:50 +0000 Subject: Change in libosmo-abis[master]: ipa: Simplify code in ipa_server_conn_read In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10657 ) Change subject: ipa: Simplify code in ipa_server_conn_read ...................................................................... ipa: Simplify code in ipa_server_conn_read By doing this change we remove a duplicated error code path and thus avoid having to maintain an extra code path with function pointers. Change-Id: I5bce9f92209cc2fb37b78792e34f7898c71d2327 --- M src/input/ipa.c 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/input/ipa.c b/src/input/ipa.c index 26bf170..554644c 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -336,15 +336,13 @@ LOGIPA(conn, LOGL_DEBUG, "message received\n"); ret = ipa_msg_recv_buffered(ofd->fd, &msg, &conn->pending_msg); - if (ret < 0) { + if (ret <= 0) { if (ret == -EAGAIN) return; - if (ret == -EPIPE || ret == -ECONNRESET) + else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(conn, LOGL_ERROR, "lost connection with server\n"); - ipa_server_conn_destroy(conn); - return; - } else if (ret == 0) { - LOGIPA(conn, LOGL_ERROR, "connection closed with server\n"); + else if (ret == 0) + LOGIPA(conn, LOGL_ERROR, "connection closed with server\n"); ipa_server_conn_destroy(conn); return; } -- To view, visit https://gerrit.osmocom.org/10657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5bce9f92209cc2fb37b78792e34f7898c71d2327 Gerrit-Change-Number: 10657 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:51 +0000 Subject: Change in libosmo-abis[master]: ipa: Allow signalling fd destroyed in ipa_client_read In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10658 ) Change subject: ipa: Allow signalling fd destroyed in ipa_client_read ...................................................................... ipa: Allow signalling fd destroyed in ipa_client_read Similar to what we do in other osmo_fd cb, check for read_cb returning -EBADF and in that case don't attempt using the osmo_fd anymore, either because the fd was already closed (no need to then signal WRITE) or because osmo_fd struct itself has been freed. Change-Id: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1 --- M include/osmocom/abis/ipa.h M src/input/ipa.c 2 files changed, 9 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index a157889..4359268 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -71,6 +71,7 @@ const char *addr; uint16_t port; void (*updown_cb)(struct ipa_client_conn *link, int up); + /* Callback when ofd has something to be read. -EBADF must be returned if the osmo_fd is destroyed. */ int (*read_cb)(struct ipa_client_conn *link, struct msgb *msg); int (*write_cb)(struct ipa_client_conn *link); void *data; diff --git a/src/input/ipa.c b/src/input/ipa.c index 554644c..d0363e2 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -47,7 +47,7 @@ link->pending_msg = NULL; } -static void ipa_client_read(struct ipa_client_conn *link) +static int ipa_client_read(struct ipa_client_conn *link) { struct osmo_fd *ofd = link->ofd; struct msgb *msg; @@ -58,7 +58,7 @@ ret = ipa_msg_recv_buffered(ofd->fd, &msg, &link->pending_msg); if (ret <= 0) { if (ret == -EAGAIN) - return; + return 0; else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(link, LOGL_ERROR, "lost connection with server\n"); else if (ret == 0) @@ -66,10 +66,11 @@ ipa_client_conn_close(link); if (link->updown_cb) link->updown_cb(link, 0); - return; + return -EBADF; } if (link->read_cb) - link->read_cb(link, msg); + return link->read_cb(link, msg); + return 0; } static void ipa_client_write(struct ipa_client_conn *link) @@ -111,7 +112,7 @@ static int ipa_client_fd_cb(struct osmo_fd *ofd, unsigned int what) { struct ipa_client_conn *link = ofd->data; - int error, ret; + int error, ret = 0; socklen_t len = sizeof(error); switch(link->state) { @@ -132,9 +133,9 @@ case IPA_CLIENT_LINK_STATE_CONNECTED: if (what & BSC_FD_READ) { LOGIPA(link, LOGL_DEBUG, "connected read\n"); - ipa_client_read(link); + ret = ipa_client_read(link); } - if (what & BSC_FD_WRITE) { + if (ret != -EBADF && (what & BSC_FD_WRITE)) { LOGIPA(link, LOGL_DEBUG, "connected write\n"); ipa_client_write(link); } -- To view, visit https://gerrit.osmocom.org/10658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1 Gerrit-Change-Number: 10658 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:52 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10660 ) Change subject: ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb ...................................................................... ipaccess: Return -EBADF when closing socket in ipaccess_bts_read_cb As we are closing the socket, there's no need for lower layers to continue handling it, so let's return -EBADF. Change-Id: I961b0ef7e598a09ce48a83038c0d90a415e0e11c --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index cce1654..24a79ea 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -738,7 +738,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } } @@ -758,7 +757,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } } @@ -774,16 +772,14 @@ if (e1i_ts->type == E1INP_TS_TYPE_NONE) { LOGP(DLINP, LOGL_ERROR, "Signalling link not initialized. Discarding." " port=%u msg_type=%u\n", link->port, msg_type); - ret = -EIO; goto err; } - + /* look up for some existing signaling link. */ sign_link = e1inp_lookup_sign_link(e1i_ts, hh->proto, 0); if (sign_link == NULL) { LOGP(DLINP, LOGL_ERROR, "no matching signalling link for " "hh->proto=0x%02x\n", hh->proto); - ret = -EIO; goto err; } msg->dst = sign_link; @@ -792,7 +788,6 @@ if (!link->line->ops->sign_link) { LOGP(DLINP, LOGL_ERROR, "Fix your application, " "no action set for signalling messages.\n"); - ret = -ENOENT; goto err; } link->line->ops->sign_link(msg); @@ -801,7 +796,7 @@ err: ipa_client_conn_close(link); msgb_free(msg); - return ret; + return -EBADF; } struct ipaccess_line { -- To view, visit https://gerrit.osmocom.org/10660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I961b0ef7e598a09ce48a83038c0d90a415e0e11c Gerrit-Change-Number: 10660 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:52 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Allow passing return code in e1inp_line_ops->sign_link() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10661 ) Change subject: ipaccess: Allow passing return code in e1inp_line_ops->sign_link() ...................................................................... ipaccess: Allow passing return code in e1inp_line_ops->sign_link() Change-Id: Ia83eead3622d86f55c1dc5e91acc78dde73a0367 --- M include/osmocom/abis/e1_input.h M src/input/ipaccess.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 3fbce5b..79455e1 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -173,6 +173,7 @@ struct e1inp_sign_link * (*sign_link_up)(void *unit_info, struct e1inp_line *line, enum e1inp_sign_type type); void (*sign_link_down)(struct e1inp_line *line); + /* Called when a new message arrives. -EBADF must be returned if the osmo_fd in link (msg->dst) is destroyed. */ int (*sign_link)(struct msgb *msg); }; diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 24a79ea..566fd64 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -279,7 +279,7 @@ " sign_link returned error: %s.\n", strerror(-rc)); } - return 0; + return rc; err_msg: msgb_free(msg); err: @@ -790,8 +790,7 @@ "no action set for signalling messages.\n"); goto err; } - link->line->ops->sign_link(msg); - return 0; + return link->line->ops->sign_link(msg); err: ipa_client_conn_close(link); -- To view, visit https://gerrit.osmocom.org/10661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia83eead3622d86f55c1dc5e91acc78dde73a0367 Gerrit-Change-Number: 10661 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 07:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 07:42:52 +0000 Subject: Change in libosmo-abis[master]: ipa: Allow signalling fd destroyed in ipa_server_conn_read In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10659 ) Change subject: ipa: Allow signalling fd destroyed in ipa_server_conn_read ...................................................................... ipa: Allow signalling fd destroyed in ipa_server_conn_read Similar to what we do in other osmo_fd cb, check for read_cb returning -EBADF and in that case don't attempt using the osmo_fd anymore, either because the fd was already closed (no need to then signal WRITE) or because osmo_fd struct itself has been freed. Change-Id: I4b968b72285f23a9552519cea67398a43d5003d2 --- M include/osmocom/abis/ipa.h M src/input/ipa.c 2 files changed, 9 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index 4359268..a738156 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -37,6 +37,7 @@ int (*closed_cb)(struct ipa_server_conn *peer); int (*ccm_cb)(struct ipa_server_conn *peer, struct msgb *msg, struct tlv_parsed *tlvp, struct ipaccess_unit *ud); + /* Callback when ofd has something to be read. -EBADF must be returned if the osmo_fd is destroyed. */ int (*cb)(struct ipa_server_conn *peer, struct msgb *msg); void *data; struct msgb *pending_msg; diff --git a/src/input/ipa.c b/src/input/ipa.c index d0363e2..09e3426 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -328,7 +328,7 @@ close(link->ofd.fd); } -static void ipa_server_conn_read(struct ipa_server_conn *conn) +static int ipa_server_conn_read(struct ipa_server_conn *conn) { struct osmo_fd *ofd = &conn->ofd; struct msgb *msg; @@ -339,18 +339,18 @@ ret = ipa_msg_recv_buffered(ofd->fd, &msg, &conn->pending_msg); if (ret <= 0) { if (ret == -EAGAIN) - return; + return 0; else if (ret == -EPIPE || ret == -ECONNRESET) LOGIPA(conn, LOGL_ERROR, "lost connection with server\n"); else if (ret == 0) LOGIPA(conn, LOGL_ERROR, "connection closed with server\n"); ipa_server_conn_destroy(conn); - return; + return -EBADF; } if (conn->cb) - conn->cb(conn, msg); + return conn->cb(conn, msg); - return; + return 0; } static void ipa_server_conn_write(struct ipa_server_conn *conn) @@ -376,11 +376,12 @@ static int ipa_server_conn_cb(struct osmo_fd *ofd, unsigned int what) { struct ipa_server_conn *conn = ofd->data; + int rc = 0; LOGP(DLINP, LOGL_DEBUG, "connected read/write\n"); if (what & BSC_FD_READ) - ipa_server_conn_read(conn); - if (what & BSC_FD_WRITE) + rc = ipa_server_conn_read(conn); + if (rc != -EBADF && (what & BSC_FD_WRITE)) ipa_server_conn_write(conn); return 0; -- To view, visit https://gerrit.osmocom.org/10659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b968b72285f23a9552519cea67398a43d5003d2 Gerrit-Change-Number: 10659 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 29 07:47:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 29 Aug 2018 07:47:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_lc?= =?UTF-8?Q?15,master,default,osmocom-master-debian9_#1088?= Message-ID: <878041520.65.1535528827408.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 49.32 KB...] make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc16gen.c GEN crc8gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC msgb.lo CC signal.lo CC bits.lo CC select.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC stat_item.lo CC macaddr.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC utils.lo CC vector.lo CC telnet_interface.lo CC stats_vty.lo CC logging_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm660.lo CC gsm620.lo CC ecu_fr.lo CC gsm690.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC rsl.lo CC tlv_parser.lo CC gsm48.lo CC gsm_utils.lo CC comp128.lo CC comp128v23.lo /bin/bash: line 2: 19379 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT a5.lo -MD -MP -MF $depbase.Tpo -c -o a5.lo a5.c Makefile:581: recipe for target 'a5.lo' failed make[3]: *** [a5.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ make[3]: Leaving directory ' Makefile:686: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:604: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:903: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Aug 29 08:02:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 29 Aug 2018 08:02:57 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_?= =?UTF-8?Q?=C2=BB_lc15,master,default,osmocom-master-debian9_#1089?= In-Reply-To: <878041520.65.1535528827408.JavaMail.jenkins@jenkins.osmocom.org> References: <878041520.65.1535528827408.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2022387269.66.1535529777458.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Aug 29 08:10:19 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 29 Aug 2018 08:10:19 +0000 Subject: Change in osmocom-bb[master]: lua: Expose API to trigger a network reselection Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/10688 Change subject: lua: Expose API to trigger a network reselection ...................................................................... lua: Expose API to trigger a network reselection Same as the "network search" VTY command but implemented as primitive and exposed to LUA. Change-Id: I096233a2ca9dd7daa358cebed0523cb8c0dbf593 --- M src/host/layer23/include/osmocom/bb/mobile/gsm322.h M src/host/layer23/include/osmocom/bb/mobile/primitives.h M src/host/layer23/src/mobile/primitives.c M src/host/layer23/src/mobile/script_lua.c 4 files changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/88/10688/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h index 66bc852..d4caac9 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h @@ -1,6 +1,11 @@ #ifndef _GSM322_H #define _GSM322_H +#include + +#include +#include + /* 4.3.1.1 List of states for PLMN slection process (automatic mode) */ #define GSM322_A0_NULL 0 #define GSM322_A1_TRYING_RPLMN 1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/primitives.h b/src/host/layer23/include/osmocom/bb/mobile/primitives.h index 034b202..f07ae24 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/primitives.h +++ b/src/host/layer23/include/osmocom/bb/mobile/primitives.h @@ -20,6 +20,7 @@ PRIM_MOB_SHUTDOWN, PRIM_MOB_SMS, PRIM_MOB_MM, + PRIM_MOB_NETWORK_RESELECT, }; struct mobile_prim_intf { diff --git a/src/host/layer23/src/mobile/primitives.c b/src/host/layer23/src/mobile/primitives.c index aa46712..f562466 100644 --- a/src/host/layer23/src/mobile/primitives.c +++ b/src/host/layer23/src/mobile/primitives.c @@ -20,6 +20,7 @@ #include +#include #include #include @@ -191,6 +192,17 @@ return gsm411_tx_sms_submit(intf->ms, param->sca, sms); } +static int network_reselect(struct mobile_prim_intf *intf) +{ + struct msgb *nmsg; + + nmsg = gsm322_msgb_alloc(GSM322_EVENT_USER_RESEL); + if (!nmsg) + return -1; + gsm322_plmn_sendmsg(intf->ms, nmsg); + return 0; +} + int mobile_prim_intf_req(struct mobile_prim_intf *intf, struct mobile_prim *prim) { int rc = 0; @@ -205,6 +217,9 @@ case OSMO_PRIM(PRIM_MOB_SMS, PRIM_OP_REQUEST): rc = send_sms(intf, &prim->u.sms); break; + case OSMO_PRIM(PRIM_MOB_NETWORK_RESELECT, PRIM_OP_REQUEST): + rc = network_reselect(intf); + break; default: LOGP(DPRIM, LOGL_ERROR, "Unknown primitive: %d\n", OSMO_PRIM_HDR(&prim->hdr)); break; diff --git a/src/host/layer23/src/mobile/script_lua.c b/src/host/layer23/src/mobile/script_lua.c index 924ed6e..9117cdd 100644 --- a/src/host/layer23/src/mobile/script_lua.c +++ b/src/host/layer23/src/mobile/script_lua.c @@ -425,6 +425,16 @@ return 1; } +static int lua_reselect_network(lua_State *L) +{ + struct mobile_prim *prim; + + prim = mobile_prim_alloc(PRIM_MOB_NETWORK_RESELECT, PRIM_OP_REQUEST); + mobile_prim_intf_req(get_primitive(L), prim); + + return 1; +} + /* Expect a fd on the stack and enable SO_PASSCRED */ static int lua_unix_passcred(lua_State *L) { @@ -546,6 +556,7 @@ { "stop", lua_ms_shutdown }, { "sms_send_simple", lua_ms_sms_send_simple }, { "number", lua_ms_name }, + { "reselect_network", lua_reselect_network }, { NULL, NULL }, }; -- To view, visit https://gerrit.osmocom.org/10688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I096233a2ca9dd7daa358cebed0523cb8c0dbf593 Gerrit-Change-Number: 10688 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 08:22:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 08:22:51 +0000 Subject: Change in openbsc[master]: gsm_data.h: Replace '.' in counter names with ':' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10662 ) Change subject: gsm_data.h: Replace '.' in counter names with ':' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I075c0f992e2e31226bd04b9c036ca125467f840e Gerrit-Change-Number: 10662 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 08:22:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 08:22:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 08:22:58 +0000 Subject: Change in openbsc[master]: abis_nm_ipaccess_rsl_connect: Log bts and trx nr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10664 ) Change subject: abis_nm_ipaccess_rsl_connect: Log bts and trx nr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I134a3da3700381043bc93aed300ce4ec263e8698 Gerrit-Change-Number: 10664 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 08:22:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 08:23:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 08:23:05 +0000 Subject: Change in openbsc[master]: Fix heap-use-after-free due to OML link destruction In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10665 ) Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9e73a3251547625a2372d58f1d8b87210d9f312 Gerrit-Change-Number: 10665 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 08:23:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 08:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 08:23:06 +0000 Subject: Change in openbsc[master]: gsm_data.h: Replace '.' in counter names with ':' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10662 ) Change subject: gsm_data.h: Replace '.' in counter names with ':' ...................................................................... gsm_data.h: Replace '.' in counter names with ':' The '.' is illegal character in counter names, as they are exported via CTRL interface, where '.' has a special meaning that cannot be used by strings comprising the variable name. Change-Id: I075c0f992e2e31226bd04b9c036ca125467f840e --- M openbsc/include/openbsc/gsm_data.h 1 file changed, 39 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 2e1e64f..f3d85ac 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -206,26 +206,26 @@ }; static const struct rate_ctr_desc bsc_ctr_description[] = { - [BSC_CTR_CHREQ_TOTAL] = {"chreq.total", "Received channel requests."}, - [BSC_CTR_CHREQ_NO_CHANNEL] = {"chreq.no_channel", "Sent to MS no channel available."}, - [BSC_CTR_HANDOVER_ATTEMPTED] = {"handover.attempted", "Received handover attempts."}, - [BSC_CTR_HANDOVER_NO_CHANNEL] = {"handover.no_channel", "Sent no channel available responses."}, - [BSC_CTR_HANDOVER_TIMEOUT] = {"handover.timeout", "Count the amount of timeouts of timer T3103."}, - [BSC_CTR_HANDOVER_COMPLETED] = {"handover.completed", "Received handover completed."}, - [BSC_CTR_HANDOVER_FAILED] = {"handover.failed", "Receive HO FAIL messages."}, - [BSC_CTR_PAGING_ATTEMPTED] = {"paging.attempted", "Paging attempts for a MS."}, - [BSC_CTR_PAGING_DETACHED] = {"paging.detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."}, - [BSC_CTR_PAGING_COMPLETED] = {"paging.completed", "Paging successful completed."}, - [BSC_CTR_PAGING_EXPIRED] = {"paging.expired", "Paging Request expired because of timeout T3113."}, - [BSC_CTR_CHAN_RF_FAIL] = {"chan.rf_fail", "Received a RF failure indication from BTS."}, - [BSC_CTR_CHAN_RLL_ERR] = {"chan.rll_err", "Received a RLL failure with T200 cause from BTS."}, - [BSC_CTR_BTS_OML_FAIL] = {"bts.oml_fail", "Received a TEI down on a OML link."}, - [BSC_CTR_BTS_RSL_FAIL] = {"bts.rsl_fail", "Received a TEI down on a OML link."}, - [BSC_CTR_CODEC_AMR_F] = {"bts.codec_amr_f", "Count the usage of AMR/F codec by channel mode requested."}, - [BSC_CTR_CODEC_AMR_H] = {"bts.codec_amr_h", "Count the usage of AMR/H codec by channel mode requested."}, - [BSC_CTR_CODEC_EFR] = {"bts.codec_efr", "Count the usage of EFR codec by channel mode requested."}, - [BSC_CTR_CODEC_V1_FR] = {"bts.codec_fr", "Count the usage of FR codec by channel mode requested."}, - [BSC_CTR_CODEC_V1_HR] = {"bts.codec_hr", "Count the usage of HR codec by channel mode requested."}, + [BSC_CTR_CHREQ_TOTAL] = {"chreq:total", "Received channel requests."}, + [BSC_CTR_CHREQ_NO_CHANNEL] = {"chreq:no_channel", "Sent to MS no channel available."}, + [BSC_CTR_HANDOVER_ATTEMPTED] = {"handover:attempted", "Received handover attempts."}, + [BSC_CTR_HANDOVER_NO_CHANNEL] = {"handover:no_channel", "Sent no channel available responses."}, + [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Count the amount of timeouts of timer T3103."}, + [BSC_CTR_HANDOVER_COMPLETED] = {"handover:completed", "Received handover completed."}, + [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Receive HO FAIL messages."}, + [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a MS."}, + [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."}, + [BSC_CTR_PAGING_COMPLETED] = {"paging:completed", "Paging successful completed."}, + [BSC_CTR_PAGING_EXPIRED] = {"paging:expired", "Paging Request expired because of timeout T3113."}, + [BSC_CTR_CHAN_RF_FAIL] = {"chan:rf_fail", "Received a RF failure indication from BTS."}, + [BSC_CTR_CHAN_RLL_ERR] = {"chan:rll_err", "Received a RLL failure with T200 cause from BTS."}, + [BSC_CTR_BTS_OML_FAIL] = {"bts:oml_fail", "Received a TEI down on a OML link."}, + [BSC_CTR_BTS_RSL_FAIL] = {"bts:rsl_fail", "Received a TEI down on a OML link."}, + [BSC_CTR_CODEC_AMR_F] = {"bts:codec_amr_f", "Count the usage of AMR/F codec by channel mode requested."}, + [BSC_CTR_CODEC_AMR_H] = {"bts:codec_amr_h", "Count the usage of AMR/H codec by channel mode requested."}, + [BSC_CTR_CODEC_EFR] = {"bts:codec_efr", "Count the usage of EFR codec by channel mode requested."}, + [BSC_CTR_CODEC_V1_FR] = {"bts:codec_fr", "Count the usage of FR codec by channel mode requested."}, + [BSC_CTR_CODEC_V1_HR] = {"bts:codec_hr", "Count the usage of HR codec by channel mode requested."}, }; enum { @@ -251,26 +251,26 @@ }; static const struct rate_ctr_desc msc_ctr_description[] = { - [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type.attach", "Received location update imsi attach requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type.normal", "Received location update normal requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type.periodic", "Received location update periodic requests."}, - [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type.detach", "Received location update detach indication."}, - [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp.failed", "Rejected location updates."}, - [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp.completed", "Successful location updates."}, - [MSC_CTR_SMS_SUBMITTED] = {"sms.submitted", "Received a RPDU from a MS (MO)."}, - [MSC_CTR_SMS_NO_RECEIVER] = {"sms.no_receiver", "Counts SMS which couldn't routed because no receiver found."}, - [MSC_CTR_SMS_DELIVERED] = {"sms.delivered", "Global SMS Deliver attempts."}, - [MSC_CTR_SMS_RP_ERR_MEM] = {"sms.rp_err_mem", "CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt."}, - [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms.rp_err_other", "Other error of MS responses on a sms delive attempt."}, - [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms.deliver_unknown_error", "Unknown error occured during sms delivery."}, + [MSC_CTR_LOC_UPDATE_TYPE_ATTACH] = {"loc_update_type:attach", "Received location update imsi attach requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_NORMAL] = {"loc_update_type:normal", "Received location update normal requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_PERIODIC] = {"loc_update_type:periodic", "Received location update periodic requests."}, + [MSC_CTR_LOC_UPDATE_TYPE_DETACH] = {"loc_update_type:detach", "Received location update detach indication."}, + [MSC_CTR_LOC_UPDATE_FAILED] = {"loc_update_resp:failed", "Rejected location updates."}, + [MSC_CTR_LOC_UPDATE_COMPLETED] = {"loc_update_resp:completed", "Successful location updates."}, + [MSC_CTR_SMS_SUBMITTED] = {"sms:submitted", "Received a RPDU from a MS (MO)."}, + [MSC_CTR_SMS_NO_RECEIVER] = {"sms:no_receiver", "Counts SMS which couldn't routed because no receiver found."}, + [MSC_CTR_SMS_DELIVERED] = {"sms:delivered", "Global SMS Deliver attempts."}, + [MSC_CTR_SMS_RP_ERR_MEM] = {"sms:rp_err_mem", "CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt."}, + [MSC_CTR_SMS_RP_ERR_OTHER] = {"sms:rp_err_other", "Other error of MS responses on a sms delive attempt."}, + [MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR] = {"sms:deliver_unknown_error", "Unknown error occured during sms delivery."}, /* FIXME: count also sms delivered */ - [MSC_CTR_CALL_MO_SETUP] = {"call.mo_setup", "Received setup requests from a MS to init a MO call."}, - [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call.mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now succesful connected up."}, - [MSC_CTR_CALL_MT_SETUP] = {"call.mt_setup", "Sent setup requests to the MS (MT)."}, - [MSC_CTR_CALL_MT_CONNECT] = {"call.mt_connect", "Sent a connect to the MS (MT)."}, - [MSC_CTR_CALL_ACTIVE] = {"call.active", "Count total amount of calls that ever reached active state."}, - [MSC_CTR_CALL_COMPLETE] = {"call.complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."}, - [MSC_CTR_CALL_INCOMPLETE] = {"call.incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."}, + [MSC_CTR_CALL_MO_SETUP] = {"call:mo_setup", "Received setup requests from a MS to init a MO call."}, + [MSC_CTR_CALL_MO_CONNECT_ACK] = {"call:mo_connect_ack", "Received a connect ack from MS of a MO call. Call is now succesful connected up."}, + [MSC_CTR_CALL_MT_SETUP] = {"call:mt_setup", "Sent setup requests to the MS (MT)."}, + [MSC_CTR_CALL_MT_CONNECT] = {"call:mt_connect", "Sent a connect to the MS (MT)."}, + [MSC_CTR_CALL_ACTIVE] = {"call:active", "Count total amount of calls that ever reached active state."}, + [MSC_CTR_CALL_COMPLETE] = {"call:complete", "Count total amount of calls which got terminated by disconnect req or ind after reaching active state."}, + [MSC_CTR_CALL_INCOMPLETE] = {"call:incomplete", "Count total amount of call which got terminated by any other reason after reaching active state."}, }; -- To view, visit https://gerrit.osmocom.org/10662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I075c0f992e2e31226bd04b9c036ca125467f840e Gerrit-Change-Number: 10662 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 08:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 08:23:06 +0000 Subject: Change in openbsc[master]: abis_nm_ipaccess_rsl_connect: Log bts and trx nr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10664 ) Change subject: abis_nm_ipaccess_rsl_connect: Log bts and trx nr ...................................................................... abis_nm_ipaccess_rsl_connect: Log bts and trx nr Back-port from osmo-bsc.git 24f2f55132f7230e387aef85612dcd6fc59cebe5. Change-Id: I134a3da3700381043bc93aed300ce4ec263e8698 --- M openbsc/src/libbsc/abis_nm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index cbb255a..922c2d5 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -2753,8 +2753,8 @@ if (ip == 0) attr_len -= 5; - DEBUGP(DNM, "ip.access RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", - inet_ntoa(ia), port, stream); + LOGP(DNM, LOGL_INFO, "(bts=%d,trx=%d) IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", + trx->bts->nr, trx->nr, inet_ntoa(ia), port, stream); return abis_nm_ipaccess_msg(trx->bts, NM_MT_IPACC_RSL_CONNECT, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, -- To view, visit https://gerrit.osmocom.org/10664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I134a3da3700381043bc93aed300ce4ec263e8698 Gerrit-Change-Number: 10664 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 08:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 08:23:06 +0000 Subject: Change in openbsc[master]: Fix heap-use-after-free due to OML link destruction In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10665 ) Change subject: Fix heap-use-after-free due to OML link destruction ...................................................................... Fix heap-use-after-free due to OML link destruction Back-port from osmo-bsc.git 9862bcb5cdb9ece0acfdfb7c81e00c05fcd33ad3. ipaccess_drop_oml was being called inside an osmo_fd cb context, were -EBADF must be returned if the structure holding the osmo_fd is freed. In the middle of the path (see OS#3495 for path tree) it goes through a signal dispatch, so it's impossible to make sure we return some value to the osmo_fd cb. As a result, it is required to defer dropping the OML Link from current code path and do it through a timer. Fixes following ASan report: 20180822124927913 <0004> abis_nm.c:787 OC=RADIO-CARRIER(02) INST=(00,00,ff): CHANGE ADMINISTRATIVE STATE NACK CAUSE=Message cannot be performed 20180822124927913 <0004> osmo_bsc_main.c:186 Got CHANGE ADMINISTRATIVE STATE NACK going to drop the OML links. 20180822124927913 <0015> bts_ipaccess_nanobts.c:406 (bts=0) Dropping OML link. ... ================================================================= ==17607==ERROR: AddressSanitizer: heap-use-after-free on address 0x62e000060a68 at pc 0x7f5ea8e27086 bp 0x7ffde92b6d80 sp 0x7ffde92b6d78 READ of size 8 at 0x62e000060a68 thread T0 #0 0x7f5ea8e27085 in handle_ts1_write input/ipaccess.c:371 #1 0x7f5ea8e27085 in ipaccess_fd_cb input/ipaccess.c:391 #2 0x7f5ea9147ca8 in osmo_fd_disp_fds libosmocore/src/select.c:217 #3 0x7f5ea9147ca8 in osmo_select_main libosmocore/src/select.c:257 #4 0x555813ab79d6 in main osmo-bsc/osmo_bsc_main.c:922 #5 0x7f5ea76d02e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #6 0x555813ab84e9 in _start (/bin/osmo-bsc+0x34d4e9) Fixes: OS#3495 Change-Id: If9e73a3251547625a2372d58f1d8b87210d9f312 --- M openbsc/include/openbsc/gsm_data_shared.h M openbsc/include/openbsc/ipaccess.h M openbsc/src/libbsc/bsc_init.c M openbsc/src/libbsc/bts_ipaccess_nanobts.c 4 files changed, 31 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index ddd5991..e616c12 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -723,6 +723,8 @@ struct gsm_e1_subslot oml_e1_link; uint8_t oml_tei; struct e1inp_sign_link *oml_link; + /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ + struct osmo_timer_list oml_drop_link_timer; /* when OML link was established */ time_t uptime; diff --git a/openbsc/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h index 82e89c2..1b5a485 100644 --- a/openbsc/include/openbsc/ipaccess.h +++ b/openbsc/include/openbsc/ipaccess.h @@ -29,6 +29,7 @@ } __attribute__((packed)); void ipaccess_drop_oml(struct gsm_bts *bts); +void ipaccess_drop_oml_deferred(struct gsm_bts *bts); void ipaccess_drop_rsl(struct gsm_bts_trx *trx); struct sdp_header_item { diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 21ed2e1..218b02a 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -65,7 +65,7 @@ } if (is_ipaccess_bts(nack->bts)) - ipaccess_drop_oml(nack->bts); + ipaccess_drop_oml_deferred(nack->bts); return 0; } diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index 64eb4f2..ea83767 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -157,7 +157,7 @@ enum abis_nm_chan_comb ccomb = abis_nm_chcomb4pchan(ts->pchan); if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - ipaccess_drop_oml(trx->bts); + ipaccess_drop_oml_deferred(trx->bts); return -1; } abis_nm_chg_adm_state(trx->bts, obj_class, @@ -360,6 +360,9 @@ struct gsm_bts *rdep_bts; struct gsm_bts_trx *trx; + /* First of all, remove deferred drop if enabled */ + osmo_timer_del(&bts->oml_drop_link_timer); + if (!bts->oml_link) return; @@ -389,6 +392,29 @@ } } +/*! Callback for \ref ipaccess_drop_oml_deferred_cb. + */ +static void ipaccess_drop_oml_deferred_cb(void *data) +{ + struct gsm_bts *bts = (struct gsm_bts *) data; + ipaccess_drop_oml(bts); +} +/*! Deferr \ref ipacces_drop_oml through a timer to avoid dropping structures in + * current code context. This may be needed if we want to destroy the OML link + * while being called from a lower layer "struct osmo_fd" cb, were it is + * mandatory to return -EBADF if the osmo_fd has been destroyed. In case code + * destroying an OML link is called through an osmo_signal, it becomes + * impossible to return any value, thus deferring the destruction is required. + */ +void ipaccess_drop_oml_deferred(struct gsm_bts *bts) +{ + if (!osmo_timer_pending(&bts->oml_drop_link_timer) && bts->oml_link) { + LOGP(DLINP, LOGL_NOTICE, "(bts=%d) Deferring Drop of OML link.\n", bts->nr); + osmo_timer_setup(&bts->oml_drop_link_timer, ipaccess_drop_oml_deferred_cb, bts); + osmo_timer_schedule(&bts->oml_drop_link_timer, 0, 0); + } +} + /* This function is called once the OML/RSL link becomes up. */ static struct e1inp_sign_link * ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, -- To view, visit https://gerrit.osmocom.org/10665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If9e73a3251547625a2372d58f1d8b87210d9f312 Gerrit-Change-Number: 10665 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:06:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 29 Aug 2018 10:06:07 +0000 Subject: Change in osmocom-bb[master]: lua: Expose API to trigger a network reselection In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10688 ) Change subject: lua: Expose API to trigger a network reselection ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10688/1/src/host/layer23/include/osmocom/bb/mobile/gsm322.h File src/host/layer23/include/osmocom/bb/mobile/gsm322.h: https://gerrit.osmocom.org/#/c/10688/1/src/host/layer23/include/osmocom/bb/mobile/gsm322.h at 4 PS1, Line 4: #include : : #include : #include I guess these headers were initially missing here, why not to do add them in a separate change? -- To view, visit https://gerrit.osmocom.org/10688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I096233a2ca9dd7daa358cebed0523cb8c0dbf593 Gerrit-Change-Number: 10688 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 29 Aug 2018 10:06:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:13:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:13:43 +0000 Subject: Change in osmo-gsm-tester[master]: Check for smpplib being installed as well In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10681 ) Change subject: Check for smpplib being installed as well ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6be1c961e512e68d5bed8b317d1dda363a58fbe7 Gerrit-Change-Number: 10681 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:13:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:17:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:17:53 +0000 Subject: Change in osmo-gsm-tester[master]: suite: Fix generation of config() dictionary In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10624 ) Change subject: suite: Fix generation of config() dictionary ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e Gerrit-Change-Number: 10624 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:17:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:17:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:17:55 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc: Parametrize codec-list VTY cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10621 ) Change subject: osmo-bsc: Parametrize codec-list VTY cfg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 Gerrit-Change-Number: 10621 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:17:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:17:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:17:59 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add suites testing different codecs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10625 ) Change subject: default-suites: Add suites testing different codecs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I591c71c66c5bbcd07466fe1d433aa87aed964fbe Gerrit-Change-Number: 10625 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:17:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:18:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:18:05 +0000 Subject: Change in osmo-gsm-tester[master]: suite: Fix generation of config() dictionary In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10624 ) Change subject: suite: Fix generation of config() dictionary ...................................................................... suite: Fix generation of config() dictionary suite.config() hasn't been activetly used anywere. New upcoming patches will start using it to set and overlay config parameters for objects which are not necessarily allocated as resources. Since these options don't apply to specific resources, there's no sense in running replicate_times() on them. Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e --- M src/osmo_gsm_tester/suite.py 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index fa86f96..3a49574 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -126,14 +126,18 @@ self.duration = 0 self.status = SuiteRun.UNKNOWN - def combined(self, conf_name): + def combined(self, conf_name, replicate_times=True): log.dbg(combining=conf_name) log.ctx(combining_scenarios=conf_name) - combination = config.replicate_times(self.definition.conf.get(conf_name, {})) + combination = self.definition.conf.get(conf_name, {}) + if replicate_times: + combination = config.replicate_times(combination) log.dbg(definition_conf=combination) for scenario in self.scenarios: log.ctx(combining_scenarios=conf_name, scenario=scenario.name()) - c = config.replicate_times(scenario.get(conf_name, {})) + c = scenario.get(conf_name, {}) + if replicate_times: + c = config.replicate_times(c) log.dbg(scenario=scenario.name(), conf=c) if c is None: continue @@ -162,7 +166,7 @@ def config(self): if self._config is None: - self._config = self.combined('config') + self._config = self.combined('config', False) return self._config def reserve_resources(self): -- To view, visit https://gerrit.osmocom.org/10624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5fcdc9151d1663e738f5c8abe588a42ab51c8f6e Gerrit-Change-Number: 10624 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:18:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:18:06 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc: Parametrize codec-list VTY cfg In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10621 ) Change subject: osmo-bsc: Parametrize codec-list VTY cfg ...................................................................... osmo-bsc: Parametrize codec-list VTY cfg Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 --- M example/defaults.conf A example/scenarios/cfg-codec-fr1.conf A example/scenarios/cfg-codec-fr2.conf A example/scenarios/cfg-codec-fr3.conf A example/scenarios/cfg-codec-hr1.conf A example/scenarios/cfg-codec-hr2.conf A example/scenarios/cfg-codec-hr3.conf M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 10 files changed, 42 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/defaults.conf b/example/defaults.conf index 61b09fb..5bdf257 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -14,6 +14,8 @@ short_name: osmo-gsm-tester-msc long_name: osmo-gsm-tester-msc encryption: a5_0 + codec_list: + - hr3 msc: net: diff --git a/example/scenarios/cfg-codec-fr1.conf b/example/scenarios/cfg-codec-fr1.conf new file mode 100644 index 0000000..f58a82d --- /dev/null +++ b/example/scenarios/cfg-codec-fr1.conf @@ -0,0 +1,5 @@ +config: + bsc: + net: + codec_list: + - fr1 diff --git a/example/scenarios/cfg-codec-fr2.conf b/example/scenarios/cfg-codec-fr2.conf new file mode 100644 index 0000000..1ad63de --- /dev/null +++ b/example/scenarios/cfg-codec-fr2.conf @@ -0,0 +1,5 @@ +config: + bsc: + net: + codec_list: + - fr2 diff --git a/example/scenarios/cfg-codec-fr3.conf b/example/scenarios/cfg-codec-fr3.conf new file mode 100644 index 0000000..fcc47cc --- /dev/null +++ b/example/scenarios/cfg-codec-fr3.conf @@ -0,0 +1,5 @@ +config: + bsc: + net: + codec_list: + - fr3 diff --git a/example/scenarios/cfg-codec-hr1.conf b/example/scenarios/cfg-codec-hr1.conf new file mode 100644 index 0000000..50a092c --- /dev/null +++ b/example/scenarios/cfg-codec-hr1.conf @@ -0,0 +1,5 @@ +config: + bsc: + net: + codec_list: + - hr1 diff --git a/example/scenarios/cfg-codec-hr2.conf b/example/scenarios/cfg-codec-hr2.conf new file mode 100644 index 0000000..e2cc9d2 --- /dev/null +++ b/example/scenarios/cfg-codec-hr2.conf @@ -0,0 +1,5 @@ +config: + bsc: + net: + codec_list: + - hr2 diff --git a/example/scenarios/cfg-codec-hr3.conf b/example/scenarios/cfg-codec-hr3.conf new file mode 100644 index 0000000..c54b924 --- /dev/null +++ b/example/scenarios/cfg-codec-hr3.conf @@ -0,0 +1,5 @@ +config: + bsc: + net: + codec_list: + - hr3 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index e4e2f9d..15f2711 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -87,7 +87,8 @@ RESOURCES_SCHEMA) CONF_SCHEMA = util.dict_add( - { 'defaults.timeout': schema.STR }, + { 'defaults.timeout': schema.STR, + 'config.bsc.net.codec_list[]': schema.CODEC }, dict([('resources.%s' % key, val) for key, val in WANT_SCHEMA.items()]), dict([('modifiers.%s' % key, val) for key, val in WANT_SCHEMA.items()])) diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 4a15bcd..174c28f 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -110,6 +110,11 @@ return raise ValueError('Unknown Channel Allocator Policy %r' % val) +def codec(val): + if val in ('hr1', 'hr2', 'hr3', 'fr1', 'fr2', 'fr3'): + return + raise ValueError('Unknown Codec value: %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -126,6 +131,7 @@ MODEM_FEATURE = 'modem_feature' PHY_CHAN = 'chan' CHAN_ALLOCATOR = 'chan_allocator' +CODEC = 'codec' SCHEMA_TYPES = { INT: int, @@ -144,6 +150,7 @@ MODEM_FEATURE: modem_feature, PHY_CHAN: phy_channel_config, CHAN_ALLOCATOR: channel_allocator, + CODEC: codec, } def validate(config, schema): diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index edcf33f..95bf5e3 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -110,7 +110,7 @@ mgw remote-port 2427 mgw local-ip ${bsc.ip_address.addr} mgw endpoint-range 1 31 - codec-list hr3 + codec-list ${' '.join(bsc.net.codec_list)} amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden -- To view, visit https://gerrit.osmocom.org/10621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1678aba43e8d399ecad192cbc416698373e3c0a0 Gerrit-Change-Number: 10621 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:18:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:18:06 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add suites testing different codecs In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10625 ) Change subject: default-suites: Add suites testing different codecs ...................................................................... default-suites: Add suites testing different codecs Change-Id: I591c71c66c5bbcd07466fe1d433aa87aed964fbe --- M example/default-suites.conf 1 file changed, 36 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 8d692fa..37de6a2 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -2,8 +2,12 @@ - aoip_sms:sysmo - ussd:sysmo - aoip_ussd:sysmo -- voice:sysmo+mod-bts0-ts-tchf -- voice:sysmo+mod-bts0-ts-tchh +- voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:sysmo+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:sysmo+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:sysmo+mod-bts0-dynts-ipa - voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo @@ -13,8 +17,12 @@ - aoip_sms:trx-b200 - ussd:trx-b200 - aoip_ussd:trx-b200 -- voice:trx-b200+mod-bts0-ts-tchf -- voice:trx-b200+mod-bts0-ts-tchh +- voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-b200+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:trx-b200+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-b200+mod-bts0-dynts-ipa - voice:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200 @@ -24,8 +32,12 @@ - aoip_sms:trx-sysmocell5000 - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 -- voice:trx-sysmocell5000+mod-bts0-ts-tchf -- voice:trx-sysmocell5000+mod-bts0-ts-tchh +- voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-sysmocell5000+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:trx-sysmocell5000+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:trx-sysmocell5000+mod-bts0-dynts-ipa - voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 @@ -35,23 +47,35 @@ - aoip_sms:octphy - ussd:octphy - aoip_ussd:octphy -- voice:octphy+mod-bts0-ts-tchf -- voice:octphy+mod-bts0-ts-tchh +- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr3 - gprs:octphy - sms:nanobts - aoip_sms:nanobts+band-1900 - ussd:nanobts+band-1900 - aoip_ussd:nanobts+band-1900 -- voice:nanobts+band-1900+mod-bts0-ts-tchf -- voice:nanobts+band-1900+mod-bts0-ts-tchh +- voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:nanobts+band-1900+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:nanobts+band-1900+mod-bts0-dynts-ipa - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-dynts-ipa - aoip_sms:nanobts+band-900 - ussd:nanobts+band-900 - aoip_ussd:nanobts+band-900 -- voice:nanobts+band-900+mod-bts0-ts-tchf -- voice:nanobts+band-900+mod-bts0-ts-tchh +- voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:nanobts+band-900+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr2 +- voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:nanobts+band-900+mod-bts0-dynts-ipa - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 -- To view, visit https://gerrit.osmocom.org/10625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I591c71c66c5bbcd07466fe1d433aa87aed964fbe Gerrit-Change-Number: 10625 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:18:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:18:07 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Remove octobts tests In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10626 ) Change subject: default-suites: Remove octobts tests ...................................................................... default-suites: Remove octobts tests Since latest release firmware, we have been unable to start up octobts correctly. As it's annoying having all those tests failing all the time, let's disable them in nightly builds until we have a working OctoBTS setup working again. Change-Id: I828723193564b3a91aeac0c163c7c8c6b7e4058c --- M example/default-suites.conf 1 file changed, 0 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 37de6a2..258d187 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -43,17 +43,6 @@ - gprs:trx-sysmocell5000 - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo -- sms:octphy -- aoip_sms:octphy -- ussd:octphy -- aoip_ussd:octphy -- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr1 -- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr2 -- voice:octphy+mod-bts0-ts-tchf+cfg-codec-fr3 -- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr1 -- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr2 -- voice:octphy+mod-bts0-ts-tchh+cfg-codec-hr3 -- gprs:octphy - sms:nanobts - aoip_sms:nanobts+band-1900 - ussd:nanobts+band-1900 -- To view, visit https://gerrit.osmocom.org/10626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I828723193564b3a91aeac0c163c7c8c6b7e4058c Gerrit-Change-Number: 10626 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:31:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:31:06 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10667 to look at the new patch set (#2). Change subject: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code ...................................................................... osmo-bts-trx: Big refactor and cleanup of osmo-trx related code * This commit is a preparation for future commits to add support for different osmo-trx devices and backends like osmo-trx-lms. * Drop deprecated osmo-trx-* cmd line params and use VTY cfg to set them. * As number of osmo-trx related osmo-gsm-tester attributes grow, group them togther in an "osmo_trx" dictionary. Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 --- M example/defaults.conf M example/resources.conf.prod M example/resources.conf.rnd M selftest/conf/resources.conf M selftest/resource_test.ok M selftest/suite_test.ok M selftest/suite_test/resources.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 12 files changed, 201 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/10667/2 -- To view, visit https://gerrit.osmocom.org/10667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 Gerrit-Change-Number: 10667 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:37:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:37:14 +0000 Subject: Change in osmo-gsm-tester[master]: Generate imsi/ki on OsmoMobile construction In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10682 ) Change subject: Generate imsi/ki on OsmoMobile construction ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b Gerrit-Change-Number: 10682 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:37:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:48:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:48:57 +0000 Subject: Change in osmo-gsm-tester[master]: Generate imsi/ki on OsmoMobile construction In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10682 ) Change subject: Generate imsi/ki on OsmoMobile construction ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10682/1/src/osmo_ms_driver/starter.py File src/osmo_ms_driver/starter.py: https://gerrit.osmocom.org/#/c/10682/1/src/osmo_ms_driver/starter.py at 74 PS1, Line 74: self._imsi, self._ki = next(self._imsi_ki_generator) This imsi_ki_generator stuff can be integrated into osmo-gsm-tester in a similar way to how we allocate new unique MSISDN, LAC, CellId, etc. See suite.py:msisdn() and resource.py:next_msisdn() as an example. -- To view, visit https://gerrit.osmocom.org/10682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b Gerrit-Change-Number: 10682 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:48:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:51:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:51:11 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10683 ) Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10683/1/src/osmo_ms_driver/starter.py File src/osmo_ms_driver/starter.py: https://gerrit.osmocom.org/#/c/10683/1/src/osmo_ms_driver/starter.py at 79 PS1, Line 79: def ki(self): fyi, The osmo-gsm-tester Modem class also requires a set_ki() API, so that tests can play with passing a wrong ki and see what happens (see suites/aoip_encryption/register_a5_1_authreq.py). -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:51:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:51:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:51:28 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10683 ) Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:51:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:54:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:54:57 +0000 Subject: Change in osmo-gsm-tester[master]: Keep track of all mobiles and copy them to unstarted later In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10684 ) Change subject: Keep track of all mobiles and copy them to unstarted later ...................................................................... Patch Set 1: I miss an explanation what's the purpose of this commit. I guess you'll need it for follow up commits, let's see. -- To view, visit https://gerrit.osmocom.org/10684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 Gerrit-Change-Number: 10684 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:54:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 10:56:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 10:56:53 +0000 Subject: Change in osmo-gsm-tester[master]: Always initialize the _started in the test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10685 ) Change subject: Always initialize the _started in the test ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10685/1/src/osmo_ms_driver/location_update_test.py File src/osmo_ms_driver/location_update_test.py: https://gerrit.osmocom.org/#/c/10685/1/src/osmo_ms_driver/location_update_test.py at 86 PS1, Line 86: self._started = [] Maybe more clean to have it more at the start of the __init__ function together with other var initialization. -- To view, visit https://gerrit.osmocom.org/10685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I675772c89e32620da5695aa4793b735cc266684c Gerrit-Change-Number: 10685 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 10:56:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 11:14:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 11:14:08 +0000 Subject: Change in osmo-gsm-tester[master]: Create a "ms_driver" stub for the testsuite In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10686 ) Change subject: Create a "ms_driver" stub for the testsuite ...................................................................... Patch Set 1: (7 comments) https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py File src/osmo_gsm_tester/ms_driver.py: https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py at 68 PS1, Line 68: def prepare(self): We usually used "configure()" for most object for this kind of action. https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py at 73 PS1, Line 73: # TODO: That needs some re-factoring This temporary socket files needs to go into the run dir. See bts_osmo.py:OsmoBtsMainUnit.pcu_socket_path() as an example on how to handle Unix sockets. Check then how pcu_osmo.py calls it to get the same path too. https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py at 81 PS1, Line 81: self._suite_run.remember_to_stop(self) That's actually aimed at (sub)classes of process.py:Process. You are probably looking for "_suite_run.register_for_cleanup()" here. We actually call it from suite.py when generating new objects. See for instance suite.py:modem(): def modem(self, specifics=None): conf = self.reserved_resources.get(resource.R_MODEM, specifics=specifics) self.dbg('create Modem object', conf=conf) ms = modem.Modem(conf) self.register_for_cleanup(ms) return ms https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py at 97 PS1, Line 97: def run_test(self): We usually used "start()" for most object for this kind of action. We then actually call "configure()" from here so that tests need as small number of lines as possible. https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py at 105 PS1, Line 105: self._test_case.run_test(self._loop, self._test_duration) Not sure right now how the SimpleLoop integrates with osmo-gsm-tester event_loop.py:EventLoop. I think it was improved since you started coding your mass LU tests, so we should try to integrate those into using EventLoop and improving it as required. https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py at 113 PS1, Line 113: def terminate(self): This should then be "cleanup(self)". https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/suite.py File src/osmo_gsm_tester/suite.py: https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/suite.py at 311 PS1, Line 311: return ms_driver.MsDriver(self) You want to call self.register_for_cleanup(ms_driver) here. -- To view, visit https://gerrit.osmocom.org/10686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d Gerrit-Change-Number: 10686 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 11:14:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 11:20:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 11:20:50 +0000 Subject: Change in osmo-gsm-tester[master]: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10687 ) Change subject: Add an initial test for the ms_driver ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10687/1/suites/netreg_mass/suite.conf File suites/netreg_mass/suite.conf: https://gerrit.osmocom.org/#/c/10687/1/suites/netreg_mass/suite.conf at 6 PS1, Line 6: # TODO: Be able to set the below to 0. Removing the "modem:" and "- times: 1" line should be enough. -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 11:20:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 11:36:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 11:36:15 +0000 Subject: Change in osmo-bsc[master]: fix dependency bug: include mgcp_client/, not mgcp/ Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10689 Change subject: fix dependency bug: include mgcp_client/, not mgcp/ ...................................................................... fix dependency bug: include mgcp_client/, not mgcp/ In osmo_bsc_sigtran.c, instead of osmocom/mgcp/mgcp_common.h, include the same file from mgcp_client/. (mgcp_common.h is identically installed both by libosmo-mgcp and libosmo-mgcp-client, in their respective include dir.) Trying to include from mgcp/ breaks the debian package builds, since only libosmo-mgcp-client is installed as per osmo-bsc dependencies. The error was introduced by: commit d8f46c0074e6c2b3b693f48ca496d11a301d4923 "MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default" change id I257ad574d8060fef19afce9798bd8a5a7f8c99fe Change-Id: I917b0c08ed91172ecb68c946aecb02c5109fcced --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/10689/1 diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 7b7d3b9..4b2c4ae 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ -- To view, visit https://gerrit.osmocom.org/10689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I917b0c08ed91172ecb68c946aecb02c5109fcced Gerrit-Change-Number: 10689 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 11:36:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 11:36:19 +0000 Subject: Change in osmo-gsm-tester[master]: Create a "ms_driver" stub for the testsuite In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10686 ) Change subject: Create a "ms_driver" stub for the testsuite ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py File src/osmo_gsm_tester/ms_driver.py: https://gerrit.osmocom.org/#/c/10686/1/src/osmo_gsm_tester/ms_driver.py at 105 PS1, Line 105: self._test_case.run_test(self._loop, self._test_duration) > Not sure right now how the SimpleLoop integrates with osmo-gsm-tester event_loop.py:EventLoop. [?] Ok, looking at the code it seems you implement your own select here. That's not going to work nice with osmo-gsm-tester, since EventLoop is used to manage/handle events for other object types, like osmo-* slave processes being launched and see if they exited prematurely, dbus messages with dbus, smpp socket fd handling, etc. So you should move your code to use EventLoop. It seems rgistering an FD to poll is not there supported in EventLoop rigth waya, but it should be easy to add by adding a new Glib.Source subclass in event_loop.py as explained in [1] then add APIs "(un)register_poll_fd" to EventLoop which uses those. [1] https://blogs.gnome.org/desrt/2012/05/09/glib-mainloop-sources-in-python-e-g-for-irclib/ Also related: https://osmocom.org/issues/2512 https://osmocom.org/issues/3234 -- To view, visit https://gerrit.osmocom.org/10686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I586b6d532c6e6395b4e6f2cf2128372237d05a7d Gerrit-Change-Number: 10686 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 11:36:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 11:37:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 11:37:33 +0000 Subject: Change in osmo-bsc[master]: fix dependency bug: include mgcp_client/, not mgcp/ In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10689 ) Change subject: fix dependency bug: include mgcp_client/, not mgcp/ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I917b0c08ed91172ecb68c946aecb02c5109fcced Gerrit-Change-Number: 10689 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 11:37:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 11:43:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 29 Aug 2018 11:43:11 +0000 Subject: Change in osmo-bsc[master]: fix dependency bug: include mgcp_client/, not mgcp/ In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10689 ) Change subject: fix dependency bug: include mgcp_client/, not mgcp/ ...................................................................... fix dependency bug: include mgcp_client/, not mgcp/ In osmo_bsc_sigtran.c, instead of osmocom/mgcp/mgcp_common.h, include the same file from mgcp_client/. (mgcp_common.h is identically installed both by libosmo-mgcp and libosmo-mgcp-client, in their respective include dir.) Trying to include from mgcp/ breaks the debian package builds, since only libosmo-mgcp-client is installed as per osmo-bsc dependencies. The error was introduced by: commit d8f46c0074e6c2b3b693f48ca496d11a301d4923 "MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default" change id I257ad574d8060fef19afce9798bd8a5a7f8c99fe Change-Id: I917b0c08ed91172ecb68c946aecb02c5109fcced --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 7b7d3b9..4b2c4ae 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ -- To view, visit https://gerrit.osmocom.org/10689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I917b0c08ed91172ecb68c946aecb02c5109fcced Gerrit-Change-Number: 10689 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:03:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 12:03:47 +0000 Subject: Change in osmo-gsm-tester[master]: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10687 ) Change subject: Add an initial test for the ms_driver ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/10687/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10687/1//COMMIT_MSG at 11 PS1, Line 11: * Should modems==0 be allowed to be set? It should be allowed for sure. You are not actually using a "modem" resource yet anyway, since afaiu the modems are still started manually at this current status. Even when you start the several mobile applications with virtphy you may still run them without being allocated as "resources" since there may not be something unique you want to reserve (like a piece of HW). It may be the case that you need a different IP addr for each mobile (which means a lot of IP addr). In that case, since some time ago I have been willing to implement "dynamic resources", that is resources which are automatically generated and don't require to be specified in resources.conf. In the case of IP addresses, that would be for instance an IP addr pool which would dynamically provide with IP addresses and assign it it a given interface (eg lo or eth depending on needs). https://gerrit.osmocom.org/#/c/10687/1//COMMIT_MSG at 12 PS1, Line 12: * I should compile/package the mobile and virtphy as well And osmo-bts-virtual in contrib/jenkins-build-osmo-bts.sh. iirc virtphy and mobile are both in osmocom-bb.git. You can add them in contrib/jenkins-build-osmocom-bb.sh. https://gerrit.osmocom.org/#/c/10687/1//COMMIT_MSG at 13 PS1, Line 13: * When executing suites shall we have a way to select only the The only difference I foresee is basically making sure we match the type of interface we use to communicate between objects, that is: if we take real modems talking over the air, then we need a BTS which talks over the air. If modems selected go through virtphy, then BTS selected has to be through virtphy. This can be done through scenario files, not need to create a new suite for each virtual/non-virtual. See example/default-suites.conf to see different stuff we run nightly. For instance: voice:nanobts+band-900+mod-bts0-ts-tchh+cfg-codec-hr3 We take the voice suite (suites/voice/suite.conf), which requires 1 BTS and 2 modem. Then through scenarios we specify several stuff: * Select first BTS to be of type nanobts (scenarios/nanobts.conf) * Select first BTS to support at least band GSM-900 (and-900.conf) * Modify the first BTS to use TCH/H timeslots (mod-bts0-ts-tchh.conf) * Configure all BSC with "codec-list hr3" (cfg-codec-hr3.conf). So we can do something similar by: * resources.conf: Add a BTS-virtual with type:osmo-bts-virtual (class not implemented yet). * Then create a new band called virtphy: "band:virtphy" * If you want to reuse existing tests with mobile+virtphy, apart from implementing the ModemOsmoMobile class, then add a bands list to modem resource to speicify which bands supports. Then, to run the voice test with virtphy, you create scenarios something like: voice:nanobts+band-virtphy+modem-band-virtphy. BTW, Regarding the ARFCN resources you see in resources.conf, they are not still used correctly, as proper algorithm to select them is needed: https://osmocom.org/issues/2230 -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 12:03:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:05:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 12:05:28 +0000 Subject: Change in osmo-gsm-tester[master]: Keep track of all mobiles and copy them to unstarted later In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10684 ) Change subject: Keep track of all mobiles and copy them to unstarted later ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 Gerrit-Change-Number: 10684 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 12:05:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:06:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 12:06:16 +0000 Subject: Change in osmo-gsm-tester[master]: Always initialize the _started in the test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10685 ) Change subject: Always initialize the _started in the test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I675772c89e32620da5695aa4793b735cc266684c Gerrit-Change-Number: 10685 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 12:06:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 12:23:15 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10667 ) Change subject: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 Gerrit-Change-Number: 10667 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 12:23:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:23:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 12:23:18 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10667 ) Change subject: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code ...................................................................... osmo-bts-trx: Big refactor and cleanup of osmo-trx related code * This commit is a preparation for future commits to add support for different osmo-trx devices and backends like osmo-trx-lms. * Drop deprecated osmo-trx-* cmd line params and use VTY cfg to set them. * As number of osmo-trx related osmo-gsm-tester attributes grow, group them togther in an "osmo_trx" dictionary. Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 --- M example/defaults.conf M example/resources.conf.prod M example/resources.conf.rnd M selftest/conf/resources.conf M selftest/resource_test.ok M selftest/suite_test.ok M selftest/suite_test/resources.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 12 files changed, 201 insertions(+), 82 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/example/defaults.conf b/example/defaults.conf index 5bdf257..fc4c324 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -75,3 +75,8 @@ - {} - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0. - phys_chan_config: TCH/F + +osmo_trx: + type: uhd + launch_trx: true + clock_reference: internal diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 31a737c..41ab009 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -24,16 +24,21 @@ ipa_unit_id: 6 addr: 10.42.42.50 band: GSM-1800 - launch_trx: true ciphers: [a5_0, a5_1] + osmo_trx: + launch_trx: true + clock_reference: external - label: sysmoCell 5000 type: osmo-bts-trx ipa_unit_id: 7 addr: 10.42.42.51 band: GSM-1800 - trx_remote_ip: 10.42.42.112 ciphers: [a5_0, a5_1] + osmo_trx: + launch_trx: false + clock_reference: external + trx_ip: 10.42.42.112 - label: OCTBTS 3500 type: osmo-bts-octphy diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 4e5c173..74b8e3e 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -24,7 +24,10 @@ ipa_unit_id: 6 addr: 10.42.42.50 band: GSM-1800 - launch_trx: true + osmo_trx: + type: uhd + launch_trx: true + clock_reference: external ciphers: [a5_0, a5_1] - label: NanoBTS-ONW-1900 diff --git a/selftest/conf/resources.conf b/selftest/conf/resources.conf index 51f4abc..84d0ab9 100644 --- a/selftest/conf/resources.conf +++ b/selftest/conf/resources.conf @@ -23,7 +23,9 @@ ipa_unit_id: 6 addr: 10.42.42.50 band: GSM-1800 - launch_trx: true + osmo_trx: + launch_trx: true + clock_reference: external ciphers: - 'a5_0' - 'a5_1' @@ -33,7 +35,10 @@ ipa_unit_id: 7 addr: 10.42.42.51 band: GSM-1800 - trx_remote_ip: 10.42.42.112 + osmo_trx: + launch_trx: false + clock_reference: external + trx_ip: 10.42.42.112 ciphers: - 'a5_0' - 'a5_1' diff --git a/selftest/resource_test.ok b/selftest/resource_test.ok index 3ec922b..08989a2 100644 --- a/selftest/resource_test.ok +++ b/selftest/resource_test.ok @@ -54,21 +54,23 @@ 'ipa_unit_id': '1', 'label': 'sysmoBTS 1002', 'type': 'osmo-bts-sysmo'}, - {'_hash': '6a9c9fbd364e1563a5b9f0826030a7888fd19575', + {'_hash': '2158317d5e0055070e7174c2498dedf53a2957e9', 'addr': '10.42.42.50', 'band': 'GSM-1800', 'ciphers': ['a5_0', 'a5_1'], 'ipa_unit_id': '6', 'label': 'Ettus B200', - 'launch_trx': 'True', + 'osmo_trx': {'clock_reference': 'external', 'launch_trx': 'True'}, 'type': 'osmo-bts-trx'}, - {'_hash': 'e50fd38e3bfe8039ac13bc315bc84f46110b7443', + {'_hash': 'f964ba5fe7a37b97ec3e0c4ef21c9231a19de45d', 'addr': '10.42.42.51', 'band': 'GSM-1800', 'ciphers': ['a5_0', 'a5_1'], 'ipa_unit_id': '7', 'label': 'sysmoCell 5000', - 'trx_remote_ip': '10.42.42.112', + 'osmo_trx': {'clock_reference': 'external', + 'launch_trx': 'False', + 'trx_ip': '10.42.42.112'}, 'type': 'osmo-bts-trx'}], 'ip_address': [{'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c', 'addr': '10.42.42.2'}, @@ -129,7 +131,7 @@ ipa_unit_id: '1' label: sysmoBTS 1002 type: osmo-bts-sysmo -- _hash: 6a9c9fbd364e1563a5b9f0826030a7888fd19575 +- _hash: 2158317d5e0055070e7174c2498dedf53a2957e9 addr: 10.42.42.50 band: GSM-1800 ciphers: @@ -137,7 +139,9 @@ - a5_1 ipa_unit_id: '6' label: Ettus B200 - launch_trx: 'True' + osmo_trx: + clock_reference: external + launch_trx: 'True' type: osmo-bts-trx --- testowner: Reserving 1 x ip_address (candidates: 5) --- testowner: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c @@ -183,7 +187,7 @@ ipa_unit_id: '1' label: sysmoBTS 1002 type: osmo-bts-sysmo -- _hash: 6a9c9fbd364e1563a5b9f0826030a7888fd19575 +- _hash: 2158317d5e0055070e7174c2498dedf53a2957e9 _reserved_by: testowner-123-1490837279 addr: 10.42.42.50 band: GSM-1800 @@ -192,7 +196,9 @@ - a5_1 ipa_unit_id: '6' label: Ettus B200 - launch_trx: 'True' + osmo_trx: + clock_reference: external + launch_trx: 'True' type: osmo-bts-trx ip_address: - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c @@ -240,15 +246,15 @@ 'ipa_unit_id': '1', 'label': 'sysmoBTS 1002', 'type': 'osmo-bts-sysmo'}, - {'_hash': '6a9c9fbd364e1563a5b9f0826030a7888fd19575', + {'_hash': '2158317d5e0055070e7174c2498dedf53a2957e9', '_reserved_by': 'testowner-123-1490837279', 'addr': '10.42.42.50', 'band': 'GSM-1800', 'ciphers': ['a5_0', 'a5_1'], 'ipa_unit_id': '6', 'label': 'Ettus B200', - 'launch_trx': 'True', 'num_trx': 2, + 'osmo_trx': {'clock_reference': 'external', 'launch_trx': 'True'}, 'type': 'osmo-bts-trx'}], 'ip_address': [{'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c', '_reserved_by': 'testowner-123-1490837279', diff --git a/selftest/suite_test.ok b/selftest/suite_test.ok index b792b57..908f24f 100644 --- a/selftest/suite_test.ok +++ b/selftest/suite_test.ok @@ -37,28 +37,34 @@ tst test_suite: DBG: {combining='modifiers'} tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] tst test_suite: Reserving 3 x bts (candidates: 6) -tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 +tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - max_power_red: '3' nominal_power: '10' - max_power_red: '0' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx -- _hash: 9eaa928b04ce04b19dbae972f9bfc3eea6f5e249 +- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009 addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - nominal_power: '10' - max_power_red: '1' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9 addr: 10.42.42.114 @@ -183,28 +189,34 @@ tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] -tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 +tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - max_power_red: '3' nominal_power: '10' - max_power_red: '0' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx -- _hash: 9eaa928b04ce04b19dbae972f9bfc3eea6f5e249 +- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009 addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - nominal_power: '10' - max_power_red: '1' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9 addr: 10.42.42.114 @@ -264,28 +276,34 @@ tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] -tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 +tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - max_power_red: '3' nominal_power: '10' - max_power_red: '0' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx -- _hash: 9eaa928b04ce04b19dbae972f9bfc3eea6f5e249 +- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009 addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - nominal_power: '10' - max_power_red: '1' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9 addr: 10.42.42.114 @@ -341,28 +359,34 @@ tst {combining_scenarios='modifiers'}: DBG: {definition_conf={}} [test_suite?{combining_scenarios='modifiers'}] [suite.py:[LINENR]] tst {combining_scenarios='modifiers', scenario='foo'}: DBG: {conf={bts=[{'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'trx_list': [{'nominal_power': '20'}, {'nominal_power': '20'}]}, {'type': 'sysmo'}]}, scenario='foo'} [test_suite?{combining_scenarios='modifiers', scenario='foo'}] [suite.py:[LINENR]] tst test_suite: Reserving 3 x bts (candidates: 6) [resource.py:[LINENR]] -tst test_suite: DBG: Picked - _hash: 076ff06a4b719e61779492d3fb99f42a6635bb72 +tst test_suite: DBG: Picked - _hash: a59640b8ba6a373552b24a6f9f65cadd2347bace addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - max_power_red: '3' nominal_power: '10' - max_power_red: '0' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx -- _hash: 9eaa928b04ce04b19dbae972f9bfc3eea6f5e249 +- _hash: c2feabd082c36a1cdeccb9a5237dfff7dbadb009 addr: 10.42.42.53 band: GSM-1800 ipa_unit_id: '7' label: sysmoCell 5000 + osmo_trx: + clock_reference: external + launch_trx: 'False' + trx_ip: 10.42.42.112 trx_list: - nominal_power: '10' - max_power_red: '1' nominal_power: '12' - trx_remote_ip: 10.42.42.112 type: osmo-bts-trx - _hash: 07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9 addr: 10.42.42.114 @@ -387,25 +411,29 @@ label: m7802 path: /wavecom_1 [resource.py:[LINENR]] -resources(test_suite)={'bts': [{'_hash': '076ff06a4b719e61779492d3fb99f42a6635bb72', +resources(test_suite)={'bts': [{'_hash': 'a59640b8ba6a373552b24a6f9f65cadd2347bace', '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', 'addr': '10.42.42.53', 'band': 'GSM-1800', 'ipa_unit_id': '7', 'label': 'sysmoCell 5000', + 'osmo_trx': {'clock_reference': 'external', + 'launch_trx': 'False', + 'trx_ip': '10.42.42.112'}, 'trx_list': [{'max_power_red': '3', 'nominal_power': '20'}, {'max_power_red': '0', 'nominal_power': '20'}], - 'trx_remote_ip': '10.42.42.112', 'type': 'osmo-bts-trx'}, - {'_hash': '9eaa928b04ce04b19dbae972f9bfc3eea6f5e249', + {'_hash': 'c2feabd082c36a1cdeccb9a5237dfff7dbadb009', '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', 'addr': '10.42.42.53', 'band': 'GSM-1800', 'ipa_unit_id': '7', 'label': 'sysmoCell 5000', + 'osmo_trx': {'clock_reference': 'external', + 'launch_trx': 'False', + 'trx_ip': '10.42.42.112'}, 'trx_list': [{'nominal_power': '20'}, {'max_power_red': '1', 'nominal_power': '20'}], - 'trx_remote_ip': '10.42.42.112', 'type': 'osmo-bts-trx'}, {'_hash': '07d9c8aaa940b674efcbbabdd69f58a6ce4e94f9', '_reserved_by': 'test_suite-[ID_NUM]-[ID_NUM]', diff --git a/selftest/suite_test/resources.conf b/selftest/suite_test/resources.conf index 440e55c..bd121cb 100644 --- a/selftest/suite_test/resources.conf +++ b/selftest/suite_test/resources.conf @@ -33,7 +33,9 @@ ipa_unit_id: 6 addr: 10.42.42.52 band: GSM-1800 - launch_trx: true + osmo_trx: + launch_trx: true + clock_reference: external trx_list: - nominal_power: 10 max_power_red: 2 @@ -44,7 +46,10 @@ ipa_unit_id: 7 addr: 10.42.42.53 band: GSM-1800 - trx_remote_ip: 10.42.42.112 + osmo_trx: + launch_trx: false + clock_reference: external + trx_ip: 10.42.42.112 trx_list: - nominal_power: 10 max_power_red: 3 @@ -56,7 +61,10 @@ ipa_unit_id: 7 addr: 10.42.42.53 band: GSM-1800 - trx_remote_ip: 10.42.42.112 + osmo_trx: + launch_trx: false + clock_reference: external + trx_ip: 10.42.42.112 trx_list: - nominal_power: 10 - nominal_power: 12 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 1584eb2..1c7349f 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -20,6 +20,7 @@ import os import pprint import tempfile +from abc import ABCMeta, abstractmethod from . import log, config, util, template, process, pcu_osmo, bts_osmo from .event_loop import MainLoop @@ -39,17 +40,15 @@ self.inst = None self.trx = None self.env = {} + self.gen_conf = {} def trx_remote_ip(self): - conf_ip = self.conf.get('trx_remote_ip', None) + conf_ip = self.conf.get('osmo_trx', {}).get('trx_ip', None) if conf_ip is not None: return conf_ip # if 'trx_remote_ip' is not configured, use same IP as BTS return self.remote_addr() - def launch_trx_enabled(self): - return util.str2bool(self.conf.get('launch_trx')) - def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) @@ -69,17 +68,22 @@ self.dbg(config_file=self.config_file) values = dict(osmo_bts_trx=config.get_defaults('osmo_bts_trx')) + config.overlay(values, dict(osmo_bts_trx=dict(osmo_trx=config.get_defaults('osmo_trx')))) config.overlay(values, self.suite_run.config()) config.overlay(values, { 'osmo_bts_trx': { 'oml_remote_ip': self.bsc.addr(), - 'trx_local_ip': self.remote_addr(), - 'trx_remote_ip': self.trx_remote_ip(), 'pcu_socket_path': self.pcu_socket_path(), + 'osmo_trx': { + 'bts_ip': self.remote_addr(), + 'trx_ip': self.trx_remote_ip(), + 'channels': [{}] # TODO: implement channels for multiTRX + } } }) config.overlay(values, { 'osmo_bts_trx': self.conf }) + self.gen_conf = values self.dbg('OSMO-BTS-TRX CONFIG:\n' + pprint.pformat(values)) with open(self.config_file, 'w') as f: @@ -87,6 +91,12 @@ self.dbg(r) f.write(r) + def launch_trx_enabled(self): + return util.str2bool(self.gen_conf['osmo_bts_trx'].get('osmo_trx', {}).get('launch_trx')) + + def get_osmo_trx_type(self): + return self.gen_conf['osmo_bts_trx'].get('osmo_trx', {}).get('type') + ######################## # PUBLIC - INTERNAL API ######################## @@ -95,6 +105,9 @@ self.dbg(conf=values) return values + def conf_for_osmotrx(self): + return dict(osmo_trx=self.gen_conf['osmo_bts_trx'].get('osmo_trx', {})) + ################### # PUBLIC (test API included) ################### @@ -108,9 +121,9 @@ self.configure() if self.launch_trx_enabled(): - self.trx = OsmoTrx(self.suite_run, self.conf, self.trx_remote_ip(), self.remote_addr()) + self.trx = OsmoTrx.get_instance_by_type(self.get_osmo_trx_type(), self.suite_run, self.conf_for_osmotrx()) self.trx.start(keepalive) - self.log('Waiting for osmo-trx to start up...') + self.log('Waiting for %s to start up...' % self.trx.name()) MainLoop.wait(self, self.trx.trx_ready) self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bts'))) @@ -124,36 +137,42 @@ '-i', self.bsc.addr()) self.suite_run.poll() -class OsmoTrx(log.Origin): - suite_run = None - run_dir = None - inst = None - env = None - proc_trx = None +class OsmoTrx(log.Origin, metaclass=ABCMeta): - BIN_TRX = 'osmo-trx-uhd' CONF_OSMO_TRX = 'osmo-trx.cfg' - def __init__(self, suite_run, conf, listen_ip, bts_ip): - super().__init__(log.C_RUN, OsmoTrx.BIN_TRX) +############## +# PROTECTED +############## + def __init__(self, suite_run, conf): + super().__init__(log.C_RUN, self.binary_name()) self.suite_run = suite_run self.conf = conf self.env = {} - self.listen_ip = listen_ip - self.bts_ip = bts_ip + self.listen_ip = conf.get('trx_ip') + self.bts_ip = conf.get('bts_ip') + self.run_dir = None + self.inst = None + self.proc_trx = None + + @classmethod + def get_instance_by_type(cls, type, suite_run, conf): + KNOWN_OSMOTRX_TYPES = { + 'uhd': OsmoTrxUHD, + } + osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type) + return osmo_trx_class(suite_run, conf) + + @abstractmethod + def binary_name(self): + 'Used by base class. Subclass can create different OsmoTRX implementations.' + pass def configure(self): self.config_file = self.run_dir.new_file(OsmoTrx.CONF_OSMO_TRX) self.dbg(config_file=self.config_file) - values = dict(osmo_bts_trx=config.get_defaults('osmo_trx')) - config.overlay(values, self.suite_run.config()) - config.overlay(values, { - 'osmo_trx': { - 'bind_ip' : self.listen_ip, - } - }) - config.overlay(values, { 'osmo_trx': self.conf }) + values = self.conf self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values)) @@ -162,16 +181,6 @@ self.dbg(r) f.write(r) - def start(self, keepalive=False): - self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) - self.configure() - self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) - lib = self.inst.child('lib') - self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_trx = self.launch_process(keepalive, OsmoTrx.BIN_TRX, '-x', - '-j', self.listen_ip, '-i', self.bts_ip, - '-C', os.path.abspath(self.config_file)) - def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) @@ -184,8 +193,30 @@ proc.launch() return proc +############## +# PUBLIC (test API included) +############## + def start(self, keepalive=False): + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + self.configure() + self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) + lib = self.inst.child('lib') + self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + self.proc_trx = self.launch_process(keepalive, self.binary_name(), + '-C', os.path.abspath(self.config_file)) + def trx_ready(self): if not self.proc_trx or not self.proc_trx.is_running: return False return '-- Transceiver active with' in (self.proc_trx.get_stdout() or '') + +class OsmoTrxUHD(OsmoTrx): + BIN_TRX = 'osmo-trx-uhd' + + def __init__(self, suite_run, conf): + super().__init__(suite_run, conf) + + def binary_name(self): + return OsmoTrxUHD.BIN_TRX + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 15f2711..9ca5665 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -54,8 +54,6 @@ 'bts[].ipa_unit_id': schema.UINT, 'bts[].addr': schema.IPV4, 'bts[].band': schema.BAND, - 'bts[].trx_remote_ip': schema.IPV4, - 'bts[].launch_trx': schema.BOOL_STR, 'bts[].direct_pcu': schema.BOOL_STR, 'bts[].ciphers[]': schema.CIPHER, 'bts[].channel_allocator': schema.CHAN_ALLOCATOR, @@ -70,6 +68,10 @@ 'bts[].trx_list[].power_supply.type': schema.STR, 'bts[].trx_list[].power_supply.device': schema.STR, 'bts[].trx_list[].power_supply.port': schema.STR, + 'bts[].osmo_trx.launch_trx': schema.BOOL_STR, + 'bts[].osmo_trx.type': schema.STR, + 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, + 'bts[].osmo_trx.trx_ip': schema.IPV4, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, 'modem[].label': schema.STR, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 174c28f..12cfd7a 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -115,6 +115,11 @@ return raise ValueError('Unknown Codec value: %r' % val) +def osmo_trx_clock_ref(val): + if val in ('internal', 'external', 'gspdo'): + return + raise ValueError('Unknown OsmoTRX clock reference value: %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -132,6 +137,7 @@ PHY_CHAN = 'chan' CHAN_ALLOCATOR = 'chan_allocator' CODEC = 'codec' +OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref' SCHEMA_TYPES = { INT: int, @@ -151,6 +157,7 @@ PHY_CHAN: phy_channel_config, CHAN_ALLOCATOR: channel_allocator, CODEC: codec, + OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref, } def validate(config, schema): diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl index d95ca6e..5dba323 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -21,8 +21,8 @@ bind ${osmo_bts_trx.addr} ! phy 0 - osmotrx ip local ${osmo_bts_trx.trx_local_ip} - osmotrx ip remote ${osmo_bts_trx.trx_remote_ip} + osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip} + osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip} instance 0 osmotrx rx-gain 25 osmotrx tx-attenuation oml diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index a197c59..2f6e830 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -1,15 +1,34 @@ ! -! OsmoHLR example configuration +! OsmoTRX example configuration ! log stderr logging filter all 1 logging color 1 logging print category 1 logging timestamp 1 + logging print file basename logging print extended-timestamp 1 logging level all info ! line vty - bind ${osmo_trx.bind_ip} + bind ${osmo_trx.trx_ip} ctrl - bind ${osmo_trx.bind_ip} + bind ${osmo_trx.trx_ip} +trx + bind-ip ${osmo_trx.trx_ip} + remote-ip ${osmo_trx.bts_ip} + base-port 5700 + egprs disable + tx-sps 4 + rx-sps 4 + clock-ref ${osmo_trx.clock_reference} + rt-prio 18 +%for chan in osmo_trx.channels: + chan ${loop.index} +% if chan.get('tx_path', False): + tx-path ${chan.tx_path} +% endif +% if chan.get('rx_path', False): + rx-path ${chan.rx_path} + %endif +%endfor -- To view, visit https://gerrit.osmocom.org/10667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 Gerrit-Change-Number: 10667 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:46:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Aug 2018 12:46:48 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10690 Change subject: mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() ...................................................................... mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() The change Ie51cc86e90ffeca5b66bcb8f6db0d389241abe57 has replaced the functions make_crcx_msg_bind() and make_crcx_msg_bind_connect() with make_crcx_msg() and add_audio(). When a bidirectional connection is needed, the user calls add_audio() to add the remaining connection details. Unfortunately add_audio() leaves the conn_mode struct member unchanged. Which means the connection is still at MGCP_CONN_RECV_ONLY, which will instruct the MGW not to forward any of the received packets. - Make sure that conn_mode is set to MGCP_CONN_RECV_SEND when add_audio() is called. Change-Id: Id12de37797de5af5cc447642d2fbb1af7de680df Closes: OS#3511 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/90/10690/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 0b5a251..5368ec3 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -131,6 +131,7 @@ mgcp_msg->presence |= MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT; mgcp_msg->audio_ip = info->addr; mgcp_msg->audio_port = info->port; + mgcp_msg->conn_mode = MGCP_CONN_RECV_SEND; } static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx) -- To view, visit https://gerrit.osmocom.org/10690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id12de37797de5af5cc447642d2fbb1af7de680df Gerrit-Change-Number: 10690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:52:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 12:52:56 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10690 ) Change subject: mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id12de37797de5af5cc447642d2fbb1af7de680df Gerrit-Change-Number: 10690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 29 Aug 2018 12:52:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:52:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 12:52:57 +0000 Subject: Change in osmo-mgw[master]: mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10690 ) Change subject: mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() ...................................................................... mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio() The change Ie51cc86e90ffeca5b66bcb8f6db0d389241abe57 has replaced the functions make_crcx_msg_bind() and make_crcx_msg_bind_connect() with make_crcx_msg() and add_audio(). When a bidirectional connection is needed, the user calls add_audio() to add the remaining connection details. Unfortunately add_audio() leaves the conn_mode struct member unchanged. Which means the connection is still at MGCP_CONN_RECV_ONLY, which will instruct the MGW not to forward any of the received packets. - Make sure that conn_mode is set to MGCP_CONN_RECV_SEND when add_audio() is called. Change-Id: Id12de37797de5af5cc447642d2fbb1af7de680df Closes: OS#3511 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 0b5a251..5368ec3 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -131,6 +131,7 @@ mgcp_msg->presence |= MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT; mgcp_msg->audio_ip = info->addr; mgcp_msg->audio_port = info->port; + mgcp_msg->conn_mode = MGCP_CONN_RECV_SEND; } static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx) -- To view, visit https://gerrit.osmocom.org/10690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id12de37797de5af5cc447642d2fbb1af7de680df Gerrit-Change-Number: 10690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:54:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 12:54:26 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add extra IP for LimeSDR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10628 ) Change subject: ansible: gsm-tester: Add extra IP for LimeSDR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0fddfc0eaf884cdd5436139675a5a19fafa96b9 Gerrit-Change-Number: 10628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 29 Aug 2018 12:54:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 12:54:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 12:54:37 +0000 Subject: Change in osmo-ci[master]: ansible: osmocom_build_deps: Add cmake In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10629 ) Change subject: ansible: osmocom_build_deps: Add cmake ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1808a2394798cd11a0bee8f664c7d18fa71cd5b8 Gerrit-Change-Number: 10629 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 29 Aug 2018 12:54:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 14:13:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 14:13:15 +0000 Subject: Change in openbsc[master]: Add osmo-bsc-nat systemd service and install it with debian Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10691 Change subject: Add osmo-bsc-nat systemd service and install it with debian ...................................................................... Add osmo-bsc-nat systemd service and install it with debian Change-Id: I29d719fbe059e38fde97371efc5e562901529b7c --- A debian/osmocom-bsc-nat.service A openbsc/contrib/systemd/osmo-bsc-nat.service 2 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/91/10691/1 diff --git a/debian/osmocom-bsc-nat.service b/debian/osmocom-bsc-nat.service new file mode 120000 index 0000000..0d5b3be --- /dev/null +++ b/debian/osmocom-bsc-nat.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-bsc-nat.service \ No newline at end of file diff --git a/openbsc/contrib/systemd/osmo-bsc-nat.service b/openbsc/contrib/systemd/osmo-bsc-nat.service new file mode 100644 index 0000000..245fc6b --- /dev/null +++ b/openbsc/contrib/systemd/osmo-bsc-nat.service @@ -0,0 +1,11 @@ +[Unit] +Description=Osmocom GSM BSC Multiplexer (NAT) + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-bsc_nat -c /etc/osmocom/osmo-bsc-nat.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/10691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I29d719fbe059e38fde97371efc5e562901529b7c Gerrit-Change-Number: 10691 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 14:13:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 14:13:15 +0000 Subject: Change in openbsc[master]: debian: Install all service files from contrib/systemd Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10692 Change subject: debian: Install all service files from contrib/systemd ...................................................................... debian: Install all service files from contrib/systemd Change-Id: Ic8259aa9f2fe1d9a5631ab102e429347bf39ceb1 --- A debian/osmo-bsc-mgcp.service A debian/osmocom-bsc-sccplite.service A debian/osmocom-nitb.service 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/92/10692/1 diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service new file mode 120000 index 0000000..0f8700b --- /dev/null +++ b/debian/osmo-bsc-mgcp.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file diff --git a/debian/osmocom-bsc-sccplite.service b/debian/osmocom-bsc-sccplite.service new file mode 120000 index 0000000..f30a9db --- /dev/null +++ b/debian/osmocom-bsc-sccplite.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-bsc-sccplite.service \ No newline at end of file diff --git a/debian/osmocom-nitb.service b/debian/osmocom-nitb.service new file mode 120000 index 0000000..eaecd9d --- /dev/null +++ b/debian/osmocom-nitb.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-nitb.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8259aa9f2fe1d9a5631ab102e429347bf39ceb1 Gerrit-Change-Number: 10692 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 14:52:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 14:52:57 +0000 Subject: Change in osmo-ci[master]: ansible: osmocom_build_deps: Add cmake In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10629 ) Change subject: ansible: osmocom_build_deps: Add cmake ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1808a2394798cd11a0bee8f664c7d18fa71cd5b8 Gerrit-Change-Number: 10629 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 14:52:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 14:52:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 14:52:58 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add extra IP for LimeSDR In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10628 ) Change subject: ansible: gsm-tester: Add extra IP for LimeSDR ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/10628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0fddfc0eaf884cdd5436139675a5a19fafa96b9 Gerrit-Change-Number: 10628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 29 Aug 2018 14:52:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 14:53:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 14:53:01 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add extra IP for LimeSDR In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10628 ) Change subject: ansible: gsm-tester: Add extra IP for LimeSDR ...................................................................... ansible: gsm-tester: Add extra IP for LimeSDR Change-Id: Ic0fddfc0eaf884cdd5436139675a5a19fafa96b9 --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index a4c86a4..c849210 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -58,3 +58,8 @@ iface {{ bts_interface }}:10 inet static address 10.42.42.52 netmask 255.255.255.0 + +auto {{ bts_interface }}:11 +iface {{ bts_interface }}:11 inet static + address 10.42.42.53 + netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/10628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0fddfc0eaf884cdd5436139675a5a19fafa96b9 Gerrit-Change-Number: 10628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 14:53:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 14:53:01 +0000 Subject: Change in osmo-ci[master]: ansible: osmocom_build_deps: Add cmake In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10629 ) Change subject: ansible: osmocom_build_deps: Add cmake ...................................................................... ansible: osmocom_build_deps: Add cmake cmake is required to build LimeSuite, and its not currently installed in the build slave. Change-Id: I1808a2394798cd11a0bee8f664c7d18fa71cd5b8 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 733866c..2ad1ec8 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -44,6 +44,8 @@ # by gapk - libasound-dev - libopencore-amrnb-dev + # by LimeSuite + - cmake - name: install build dependencies and libraries apt: -- To view, visit https://gerrit.osmocom.org/10629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1808a2394798cd11a0bee8f664c7d18fa71cd5b8 Gerrit-Change-Number: 10629 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Aug 29 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 29 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#230?= In-Reply-To: <1936289173.57.1535469006615.JavaMail.jenkins@jenkins.osmocom.org> References: <1936289173.57.1535469006615.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1633744920.68.1535555407014.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Aug 29 15:17:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 15:17:37 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: Add systemd service file and install with debian Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10693 Change subject: ctrl2cgi: Add systemd service file and install with debian ...................................................................... ctrl2cgi: Add systemd service file and install with debian Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 --- A contrib/systemd/ctrl2cgi.service A debian/python3-osmopy-utils.ctrl2cgi.service M debian/rules 3 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/93/10693/1 diff --git a/contrib/systemd/ctrl2cgi.service b/contrib/systemd/ctrl2cgi.service new file mode 100644 index 0000000..36ff78b --- /dev/null +++ b/contrib/systemd/ctrl2cgi.service @@ -0,0 +1,11 @@ +[Unit] +Description=Proxy between given GCI service and Osmocom CTRL protocol + +[Service] +Type=simple +Restart=always +ExecStart=python3 /usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/python3-osmopy-utils.ctrl2cgi.service b/debian/python3-osmopy-utils.ctrl2cgi.service new file mode 120000 index 0000000..e8cde65 --- /dev/null +++ b/debian/python3-osmopy-utils.ctrl2cgi.service @@ -0,0 +1 @@ +../contrib/systemd/ctrl2cgi.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index d9e98af..6bdd719 100755 --- a/debian/rules +++ b/debian/rules @@ -12,3 +12,8 @@ rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils rm -rf $(CURDIR)/debian/python3-osmopy-utils/usr/lib + +override_dh_installinit: + # Install service file with different name than package name: + # https://unix.stackexchange.com/questions/306234/is-it-possible-to-install-two-services-for-one-package-using-dh-installinit-how + dh_installinit --name=ctrl2cgi -- To view, visit https://gerrit.osmocom.org/10693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 Gerrit-Change-Number: 10693 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 15:27:38 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Aug 2018 15:27:38 +0000 Subject: Change in osmo-bts[master]: measurement: add SUB measurements in test_lchan_meas_process_measurement Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10694 Change subject: measurement: add SUB measurements in test_lchan_meas_process_measurement ...................................................................... measurement: add SUB measurements in test_lchan_meas_process_measurement The unit-test function test_lchan_meas_process_measurement() does not tag measurements as SUB. Lets make the test function more realistic by setting the is_sub flag at the correct positions. - Add SUB-Measurements in the correct position - Print log lines when adding measurements for sub, also fix minor bugs in the log printing. Change-Id: I25c361b21a406c0017ee586f0492c38f2e737e57 Related: OS#3502 Related: OS#2975 --- M tests/meas/meas_test.c M tests/meas/meas_test.ok 2 files changed, 66 insertions(+), 417 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/10694/1 diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 035bbe7..bb9c0be 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -888,6 +888,7 @@ unsigned int i; unsigned int k = 0; unsigned int fn = 0; + unsigned int fn104; struct bts_ul_meas ulm; printf("\n\n"); @@ -911,12 +912,21 @@ /* feed uplink measurements into the code */ for (i = 0; i < 100; i++) { - if (dropouts == false || i % 4) + fn104 = fn % 104; + ulm.is_sub = 0; + + if (fn104 >= 52 && fn104 <= 59) { + ulm.is_sub = 1; + } + + if (dropouts == false || i % 4) { + if (ulm.is_sub == 1) + printf("(now adding SUB measurement sample %u)\n", fn); lchan_meas_process_measurement(lchan, &ulm, fn); + } else if (ulm.is_sub == 1) + printf("(leaving out SUB measurement sample for frame number %u)\n", fn); else - printf - ("(leaving out measurement sample for frame number %u)\n", - fn); + printf("(leaving out measurement sample for frame number %u)\n", fn); fn += 4; if (k == 2) { @@ -926,12 +936,11 @@ k++; if (fn % 104 == 39 && no_sacch == false) { - printf - ("(now adding measurement sample for SACCH block)\n"); + printf("(now adding SUB measurement sample for SACCH block at frame number %u)\n", fn); + ulm.is_sub = 1; lchan_meas_process_measurement(lchan, &ulm, fn - 1); - } else - printf - ("(leaving out measurement sample for SACCH block)\n"); + } else if (fn % 104 == 39 && no_sacch == true) + printf("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", fn); } } diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index e16bf4a..fdbf5d2 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -589,341 +589,73 @@ =========================================================== Testing lchan_meas_process_measurement() -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 39) +(now adding SUB measurement sample 52) +(now adding SUB measurement sample 56) +(now adding SUB measurement sample for SACCH block at frame number 143) +(now adding SUB measurement sample 156) +(now adding SUB measurement sample 160) +(now adding SUB measurement sample for SACCH block at frame number 247) +(now adding SUB measurement sample 260) +(now adding SUB measurement sample 264) +(now adding SUB measurement sample for SACCH block at frame number 351) +(now adding SUB measurement sample 364) +(now adding SUB measurement sample 368) =========================================================== Testing lchan_meas_process_measurement() * SACCH blocks not generated. -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 39) +(now adding SUB measurement sample 52) +(now adding SUB measurement sample 56) +(leaving out SUB measurement sample for SACCH block at frame number 143) +(now adding SUB measurement sample 156) +(now adding SUB measurement sample 160) +(leaving out SUB measurement sample for SACCH block at frame number 247) +(now adding SUB measurement sample 260) +(now adding SUB measurement sample 264) +(leaving out SUB measurement sample for SACCH block at frame number 351) +(now adding SUB measurement sample 364) +(now adding SUB measurement sample 368) =========================================================== Testing lchan_meas_process_measurement() * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 17) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 34) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 52) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 39) +(leaving out SUB measurement sample for frame number 52) +(now adding SUB measurement sample 56) (leaving out measurement sample for frame number 69) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 86) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 104) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 121) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 138) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 156) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 143) +(leaving out SUB measurement sample for frame number 156) +(now adding SUB measurement sample 160) (leaving out measurement sample for frame number 173) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 190) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 208) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 225) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 242) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 260) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 247) +(leaving out SUB measurement sample for frame number 260) +(now adding SUB measurement sample 264) (leaving out measurement sample for frame number 277) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 294) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 312) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 329) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 346) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 364) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 351) +(leaving out SUB measurement sample for frame number 364) +(now adding SUB measurement sample 368) (leaving out measurement sample for frame number 381) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 398) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 416) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) =========================================================== @@ -931,128 +663,36 @@ * SACCH blocks not generated. * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 17) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 34) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 52) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 39) +(leaving out SUB measurement sample for frame number 52) +(now adding SUB measurement sample 56) (leaving out measurement sample for frame number 69) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 86) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 104) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 121) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 138) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 156) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 143) +(leaving out SUB measurement sample for frame number 156) +(now adding SUB measurement sample 160) (leaving out measurement sample for frame number 173) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 190) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 208) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 225) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 242) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 260) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 247) +(leaving out SUB measurement sample for frame number 260) +(now adding SUB measurement sample 264) (leaving out measurement sample for frame number 277) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 294) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 312) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 329) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 346) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 364) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 351) +(leaving out SUB measurement sample for frame number 364) +(now adding SUB measurement sample 368) (leaving out measurement sample for frame number 381) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 398) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 416) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) Success -- To view, visit https://gerrit.osmocom.org/10694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I25c361b21a406c0017ee586f0492c38f2e737e57 Gerrit-Change-Number: 10694 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 15:36:47 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Aug 2018 15:36:47 +0000 Subject: Change in osmo-bts[master]: measurement: fix sub frame table for TCH/H, SS1 Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10695 Change subject: measurement: fix sub frame table for TCH/H, SS1 ...................................................................... measurement: fix sub frame table for TCH/H, SS1 The Table that lists the fn%104 frame number masks that define which of the incoming measurements to be recognized as SUB measurements contains one wrong number. For comparison see also: 3GPP TS 05.08, chapter 8.3 Aspects of discontinuous transmission (DTX) - Change 29 to 20 in ts45008_83_tch_hs1[] Change-Id: Id3698551d94866f418e662b9fe81429b16e2621c Related: OS#3502 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/10695/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 158849d..b0ef869 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -14,7 +14,7 @@ /* Tables as per TS 45.008 Section 8.3 */ static const uint8_t ts45008_83_tch_f[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; static const uint8_t ts45008_83_tch_hs0[] = { 0, 2, 4, 6, 52, 54, 56, 58 }; -static const uint8_t ts45008_83_tch_hs1[] = { 14, 16, 18, 29, 66, 68, 70, 72 }; +static const uint8_t ts45008_83_tch_hs1[] = { 14, 16, 18, 20, 66, 68, 70, 72 }; /* find out if an array contains a given key as element */ #define ARRAY_CONTAINS(arr, val) array_contains(arr, ARRAY_SIZE(arr), val) -- To view, visit https://gerrit.osmocom.org/10695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id3698551d94866f418e662b9fe81429b16e2621c Gerrit-Change-Number: 10695 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 15:36:47 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 29 Aug 2018 15:36:47 +0000 Subject: Change in osmo-bts[master]: measurement: add unit tests for ts45008_83_is_sub() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10696 Change subject: measurement: add unit tests for ts45008_83_is_sub() ...................................................................... measurement: add unit tests for ts45008_83_is_sub() The function ts45008_83_is_sub() is an integral part of the measurement calculation as it automatically tags incoming measurements as SUB measurements. This is important in the context of DTX. Unfortunately there is no unit test for this function yet. - Add unit test for ts45008_83_is_sub() Change-Id: Ia26774859f4bf31baee075896905079368bddd42 Related: OS#3502 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 4 files changed, 163 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/10696/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 5c3def0..b4fc35b 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -12,6 +12,8 @@ void lchan_meas_reset(struct gsm_lchan *lchan); +bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn, bool is_amr_sid_update); + int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn); bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn); diff --git a/src/common/measurement.c b/src/common/measurement.c index b0ef869..bc27287 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -27,8 +27,9 @@ return false; } -/* Decide if a given frame number is part of the "-SUB" measurements (true) or not (false) */ -static bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn, bool is_amr_sid_update) +/* Decide if a given frame number is part of the "-SUB" measurements (true) or not (false) + * (this function is only used internally, it is public to call it from unit-tests) */ +bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn, bool is_amr_sid_update) { uint32_t fn104 = fn % 104; diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 0166771..4009ddb 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -719,6 +719,138 @@ } } +static bool test_ts45008_83_is_sub_is_sacch(uint32_t fn) +{ + if (fn % 104 == 12) + return true; + if (fn % 104 == 25) + return true; + if (fn % 104 == 38) + return true; + if (fn % 104 == 51) + return true; + if (fn % 104 == 64) + return true; + if (fn % 104 == 77) + return true; + if (fn % 104 == 90) + return true; + if (fn % 104 == 103) + return true; + + return false; +} + +static bool test_ts45008_83_is_sub_is_sub(uint32_t fn, uint8_t ss) +{ + fn = fn % 104; + + if (fn >= 52 && fn <= 59) + return true; + + if (ss == 0) { + if (fn == 0) + return true; + if (fn == 2) + return true; + if (fn == 4) + return true; + if (fn == 6) + return true; + if (fn == 52) + return true; + if (fn == 54) + return true; + if (fn == 56) + return true; + if (fn == 58) + return true; + } else if (ss == 1) { + if (fn == 14) + return true; + if (fn == 16) + return true; + if (fn == 18) + return true; + if (fn == 20) + return true; + if (fn == 66) + return true; + if (fn == 68) + return true; + if (fn == 70) + return true; + if (fn == 72) + return true; + } else + OSMO_ASSERT(false); + + return false; +} + +static void test_ts45008_83_is_sub_single(uint8_t ts, uint8_t ss, bool fr) +{ + struct gsm_lchan *lchan; + bool rc; + unsigned int i; + + lchan = &trx->ts[ts].lchan[ss]; + + printf("Checking: "); + + if (fr) { + printf("TCH/F"); + lchan->type = GSM_LCHAN_TCH_F; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->tch_mode = GSM48_CMODE_SPEECH_V1; + } else { + printf("TCH/H"); + lchan->type = GSM_LCHAN_TCH_H; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->tch_mode = GSM48_CMODE_SPEECH_V1; + } + + printf(" TS=%u ", ts); + printf("SS=%u", ss); + + /* Walk trough the first 100 intervals and check for unexpected + * results (false positive and false negative) */ + for (i = 0; i < 104 * 100; i++) { + rc = ts45008_83_is_sub(lchan, i, false); + if (rc) { + if (!test_ts45008_83_is_sub_is_sacch(i) + && !test_ts45008_83_is_sub_is_sub(i, ss)) { + printf("==> Unexpected SUB frame at fn=%u", i); + OSMO_ASSERT(false); + } + } else { + if (test_ts45008_83_is_sub_is_sacch(i) + && test_ts45008_83_is_sub_is_sub(i, ss)) { + printf("==> Unexpected non-SUB frame at fn=%u", + i); + OSMO_ASSERT(false); + } + } + } + printf("\n"); +} + +static void test_ts45008_83_is_sub(void) +{ + unsigned int i; + + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing ts45008_83_is_sub()\n"); + + for (i = 0; i < 7; i++) + test_ts45008_83_is_sub_single(i, 0, true); + for (i = 0; i < 7; i++) + test_ts45008_83_is_sub_single(i, 0, false); + for (i = 0; i < 7; i++) + test_ts45008_83_is_sub_single(i, 1, false); +} + int main(int argc, char **argv) { void *tall_bts_ctx; @@ -785,6 +917,7 @@ test_lchan_meas_process_measurement(true, false); test_lchan_meas_process_measurement(false, true); test_lchan_meas_process_measurement(true, true); + test_ts45008_83_is_sub(); printf("Success\n"); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index d8f8174..ac32acf 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -1055,4 +1055,29 @@ (leaving out measurement sample for SACCH block) (leaving out measurement sample for SACCH block) (leaving out measurement sample for SACCH block) + + +=========================================================== +Testing ts45008_83_is_sub() +Checking: TCH/F TS=0 SS=0 +Checking: TCH/F TS=1 SS=0 +Checking: TCH/F TS=2 SS=0 +Checking: TCH/F TS=3 SS=0 +Checking: TCH/F TS=4 SS=0 +Checking: TCH/F TS=5 SS=0 +Checking: TCH/F TS=6 SS=0 +Checking: TCH/H TS=0 SS=0 +Checking: TCH/H TS=1 SS=0 +Checking: TCH/H TS=2 SS=0 +Checking: TCH/H TS=3 SS=0 +Checking: TCH/H TS=4 SS=0 +Checking: TCH/H TS=5 SS=0 +Checking: TCH/H TS=6 SS=0 +Checking: TCH/H TS=0 SS=1 +Checking: TCH/H TS=1 SS=1 +Checking: TCH/H TS=2 SS=1 +Checking: TCH/H TS=3 SS=1 +Checking: TCH/H TS=4 SS=1 +Checking: TCH/H TS=5 SS=1 +Checking: TCH/H TS=6 SS=1 Success -- To view, visit https://gerrit.osmocom.org/10696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia26774859f4bf31baee075896905079368bddd42 Gerrit-Change-Number: 10696 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:04:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:04:18 +0000 Subject: Change in osmo-bts[master]: measurement: fix sub frame table for TCH/H, SS1 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10695 ) Change subject: measurement: fix sub frame table for TCH/H, SS1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id3698551d94866f418e662b9fe81429b16e2621c Gerrit-Change-Number: 10695 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 17:04:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:04:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:04:31 +0000 Subject: Change in osmo-bts[master]: measurement: add unit tests for ts45008_83_is_sub() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10696 ) Change subject: measurement: add unit tests for ts45008_83_is_sub() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia26774859f4bf31baee075896905079368bddd42 Gerrit-Change-Number: 10696 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 17:04:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:04:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:04:33 +0000 Subject: Change in osmo-bts[master]: measurement: fix sub frame table for TCH/H, SS1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10695 ) Change subject: measurement: fix sub frame table for TCH/H, SS1 ...................................................................... measurement: fix sub frame table for TCH/H, SS1 The Table that lists the fn%104 frame number masks that define which of the incoming measurements to be recognized as SUB measurements contains one wrong number. For comparison see also: 3GPP TS 05.08, chapter 8.3 Aspects of discontinuous transmission (DTX) - Change 29 to 20 in ts45008_83_tch_hs1[] Change-Id: Id3698551d94866f418e662b9fe81429b16e2621c Related: OS#3502 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/measurement.c b/src/common/measurement.c index 158849d..b0ef869 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -14,7 +14,7 @@ /* Tables as per TS 45.008 Section 8.3 */ static const uint8_t ts45008_83_tch_f[] = { 52, 53, 54, 55, 56, 57, 58, 59 }; static const uint8_t ts45008_83_tch_hs0[] = { 0, 2, 4, 6, 52, 54, 56, 58 }; -static const uint8_t ts45008_83_tch_hs1[] = { 14, 16, 18, 29, 66, 68, 70, 72 }; +static const uint8_t ts45008_83_tch_hs1[] = { 14, 16, 18, 20, 66, 68, 70, 72 }; /* find out if an array contains a given key as element */ #define ARRAY_CONTAINS(arr, val) array_contains(arr, ARRAY_SIZE(arr), val) -- To view, visit https://gerrit.osmocom.org/10695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id3698551d94866f418e662b9fe81429b16e2621c Gerrit-Change-Number: 10695 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:04:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:04:33 +0000 Subject: Change in osmo-bts[master]: measurement: add unit tests for ts45008_83_is_sub() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10696 ) Change subject: measurement: add unit tests for ts45008_83_is_sub() ...................................................................... measurement: add unit tests for ts45008_83_is_sub() The function ts45008_83_is_sub() is an integral part of the measurement calculation as it automatically tags incoming measurements as SUB measurements. This is important in the context of DTX. Unfortunately there is no unit test for this function yet. - Add unit test for ts45008_83_is_sub() Change-Id: Ia26774859f4bf31baee075896905079368bddd42 Related: OS#3502 --- M include/osmo-bts/measurement.h M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok 4 files changed, 163 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 5c3def0..b4fc35b 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -12,6 +12,8 @@ void lchan_meas_reset(struct gsm_lchan *lchan); +bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn, bool is_amr_sid_update); + int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn); bool is_meas_overdue(struct gsm_lchan *lchan, uint32_t *fn_missed_end, uint32_t fn); diff --git a/src/common/measurement.c b/src/common/measurement.c index b0ef869..bc27287 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -27,8 +27,9 @@ return false; } -/* Decide if a given frame number is part of the "-SUB" measurements (true) or not (false) */ -static bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn, bool is_amr_sid_update) +/* Decide if a given frame number is part of the "-SUB" measurements (true) or not (false) + * (this function is only used internally, it is public to call it from unit-tests) */ +bool ts45008_83_is_sub(struct gsm_lchan *lchan, uint32_t fn, bool is_amr_sid_update) { uint32_t fn104 = fn % 104; diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 0166771..4009ddb 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -719,6 +719,138 @@ } } +static bool test_ts45008_83_is_sub_is_sacch(uint32_t fn) +{ + if (fn % 104 == 12) + return true; + if (fn % 104 == 25) + return true; + if (fn % 104 == 38) + return true; + if (fn % 104 == 51) + return true; + if (fn % 104 == 64) + return true; + if (fn % 104 == 77) + return true; + if (fn % 104 == 90) + return true; + if (fn % 104 == 103) + return true; + + return false; +} + +static bool test_ts45008_83_is_sub_is_sub(uint32_t fn, uint8_t ss) +{ + fn = fn % 104; + + if (fn >= 52 && fn <= 59) + return true; + + if (ss == 0) { + if (fn == 0) + return true; + if (fn == 2) + return true; + if (fn == 4) + return true; + if (fn == 6) + return true; + if (fn == 52) + return true; + if (fn == 54) + return true; + if (fn == 56) + return true; + if (fn == 58) + return true; + } else if (ss == 1) { + if (fn == 14) + return true; + if (fn == 16) + return true; + if (fn == 18) + return true; + if (fn == 20) + return true; + if (fn == 66) + return true; + if (fn == 68) + return true; + if (fn == 70) + return true; + if (fn == 72) + return true; + } else + OSMO_ASSERT(false); + + return false; +} + +static void test_ts45008_83_is_sub_single(uint8_t ts, uint8_t ss, bool fr) +{ + struct gsm_lchan *lchan; + bool rc; + unsigned int i; + + lchan = &trx->ts[ts].lchan[ss]; + + printf("Checking: "); + + if (fr) { + printf("TCH/F"); + lchan->type = GSM_LCHAN_TCH_F; + lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan->tch_mode = GSM48_CMODE_SPEECH_V1; + } else { + printf("TCH/H"); + lchan->type = GSM_LCHAN_TCH_H; + lchan->ts->pchan = GSM_PCHAN_TCH_H; + lchan->tch_mode = GSM48_CMODE_SPEECH_V1; + } + + printf(" TS=%u ", ts); + printf("SS=%u", ss); + + /* Walk trough the first 100 intervals and check for unexpected + * results (false positive and false negative) */ + for (i = 0; i < 104 * 100; i++) { + rc = ts45008_83_is_sub(lchan, i, false); + if (rc) { + if (!test_ts45008_83_is_sub_is_sacch(i) + && !test_ts45008_83_is_sub_is_sub(i, ss)) { + printf("==> Unexpected SUB frame at fn=%u", i); + OSMO_ASSERT(false); + } + } else { + if (test_ts45008_83_is_sub_is_sacch(i) + && test_ts45008_83_is_sub_is_sub(i, ss)) { + printf("==> Unexpected non-SUB frame at fn=%u", + i); + OSMO_ASSERT(false); + } + } + } + printf("\n"); +} + +static void test_ts45008_83_is_sub(void) +{ + unsigned int i; + + printf("\n\n"); + printf("===========================================================\n"); + printf("Testing ts45008_83_is_sub()\n"); + + for (i = 0; i < 7; i++) + test_ts45008_83_is_sub_single(i, 0, true); + for (i = 0; i < 7; i++) + test_ts45008_83_is_sub_single(i, 0, false); + for (i = 0; i < 7; i++) + test_ts45008_83_is_sub_single(i, 1, false); +} + int main(int argc, char **argv) { void *tall_bts_ctx; @@ -785,6 +917,7 @@ test_lchan_meas_process_measurement(true, false); test_lchan_meas_process_measurement(false, true); test_lchan_meas_process_measurement(true, true); + test_ts45008_83_is_sub(); printf("Success\n"); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index d8f8174..ac32acf 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -1055,4 +1055,29 @@ (leaving out measurement sample for SACCH block) (leaving out measurement sample for SACCH block) (leaving out measurement sample for SACCH block) + + +=========================================================== +Testing ts45008_83_is_sub() +Checking: TCH/F TS=0 SS=0 +Checking: TCH/F TS=1 SS=0 +Checking: TCH/F TS=2 SS=0 +Checking: TCH/F TS=3 SS=0 +Checking: TCH/F TS=4 SS=0 +Checking: TCH/F TS=5 SS=0 +Checking: TCH/F TS=6 SS=0 +Checking: TCH/H TS=0 SS=0 +Checking: TCH/H TS=1 SS=0 +Checking: TCH/H TS=2 SS=0 +Checking: TCH/H TS=3 SS=0 +Checking: TCH/H TS=4 SS=0 +Checking: TCH/H TS=5 SS=0 +Checking: TCH/H TS=6 SS=0 +Checking: TCH/H TS=0 SS=1 +Checking: TCH/H TS=1 SS=1 +Checking: TCH/H TS=2 SS=1 +Checking: TCH/H TS=3 SS=1 +Checking: TCH/H TS=4 SS=1 +Checking: TCH/H TS=5 SS=1 +Checking: TCH/H TS=6 SS=1 Success -- To view, visit https://gerrit.osmocom.org/10696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia26774859f4bf31baee075896905079368bddd42 Gerrit-Change-Number: 10696 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:04:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:04:59 +0000 Subject: Change in osmo-bts[master]: measurement: fix is_meas_overdue() and increase testcoverage In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10654 ) Change subject: measurement: fix is_meas_overdue() and increase testcoverage ...................................................................... measurement: fix is_meas_overdue() and increase testcoverage The tests TC_meas_res_sign_sdcch4 and TC_meas_res_sign_sdcch8 are failing mainly because lchan->ts->nr is confused with lchan->nr. There is also a small problem with one of the formulas that compute fn_missed_end. - Add explainatory comment to the lookup tables on what the index is refering to - use lchan-nr instead of lchan->ts->nr when dealing with SDCCH/4/8 - simplfy and fix the formula - increase the testcoverage of the unit tests, give SDCCH/4/8 also a thorough check. Change-Id: I5d555a21003943bf720c53f3a611029ba45339a9 Related: OS#2975 --- M src/common/measurement.c M tests/meas/meas_test.c 2 files changed, 231 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/measurement.c b/src/common/measurement.c index bc27287..7b41437 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -115,7 +115,10 @@ * 4 4 and 5 52 to 51 64, 90, 12, 38 * 5 4 and 5 65 to 64 77, 103, 25, 51 * 6 6 and 7 78 to 77 90, 12, 38, 64 - * 7 6 and 7 91 to 90 103, 25, 51, 77 */ + * 7 6 and 7 91 to 90 103, 25, 51, 77 + * + * Note: The array index of the following three lookup tables refes to a + * timeslot number. */ static const uint8_t tchf_meas_rep_fn104[] = { [0] = 90, @@ -156,7 +159,10 @@ * * SDCCH/8 12 to 11 * SDCCH/4 37 to 36 - */ + * + * + * Note: The array index of the following three lookup tables refes to a + * subslot number. */ /* FN of the first burst whose block completes before reaching fn%102=11 */ static const uint8_t sdcch8_meas_rep_fn102[] = { @@ -311,6 +317,7 @@ { uint32_t fn_mod; uint32_t last_fn_mod; + uint32_t fn_rounded; uint8_t interval_end; uint8_t modulus; const uint8_t *tbl; @@ -341,12 +348,12 @@ case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: modulus = 102; - interval_end = sdcch8_meas_rep_fn102[lchan->ts->nr]; + interval_end = sdcch8_meas_rep_fn102[lchan->nr]; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: modulus = 102; - interval_end = sdcch4_meas_rep_fn102[lchan->ts->nr]; + interval_end = sdcch4_meas_rep_fn102[lchan->nr]; break; default: return false; @@ -355,6 +362,7 @@ fn_mod = fn % modulus; last_fn_mod = lchan->meas.last_fn % modulus; + fn_rounded = fn - fn_mod; if (fn_mod > last_fn_mod) { /* When the current frame number is larger then the last frame @@ -362,7 +370,7 @@ * the two. If it does we calculate the absolute frame number * position on which the interval should have ended. */ if (interval_end > last_fn_mod && interval_end < fn_mod) { - *fn_missed_end = interval_end + fn - fn_mod; + *fn_missed_end = interval_end + fn_rounded; return true; } } else { @@ -375,7 +383,7 @@ if (fn < lchan->meas.last_fn) *fn_missed_end = interval_end + GSM_MAX_FN - modulus; else - *fn_missed_end = interval_end + fn - modulus; + *fn_missed_end = interval_end + fn_rounded - modulus; return true; } /* We also check the section that starts from the beginning of @@ -384,7 +392,7 @@ if (fn < lchan->meas.last_fn) *fn_missed_end = interval_end; else - *fn_missed_end = interval_end + fn - fn_mod; + *fn_missed_end = interval_end + fn_rounded; return true; } } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 4009ddb..680c1c3 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -482,6 +482,222 @@ rc = is_meas_overdue(lchan, &fn_missed_end, GSM_MAX_FN - 1); OSMO_ASSERT(!rc); OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* Missing period-end-trigger at fn=66, SDCCH/8, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 15 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 66); + + /* Missing period-end-trigger at fn=70, SDCCH/8, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 51; + rc = is_meas_overdue(lchan, &fn_missed_end, 19 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 70); + + /* Missing period-end-trigger at fn=74, SDCCH/8, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 55; + rc = is_meas_overdue(lchan, &fn_missed_end, 23 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 74); + + /* Missing period-end-trigger at fn=78, SDCCH/8, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 59; + rc = is_meas_overdue(lchan, &fn_missed_end, 27 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 78); + + /* Missing period-end-trigger at fn=98, SDCCH/8, TS0, SS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[4]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 82; + rc = is_meas_overdue(lchan, &fn_missed_end, 31 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 98); + + /* Missing period-end-trigger at fn=102, SDCCH/8, TS0, SS5 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[5]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 35 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 102); + + /* Missing period-end-trigger at fn=106, SDCCH/8, TS0, SS6 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[6]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 90; + rc = is_meas_overdue(lchan, &fn_missed_end, 39 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 4 + 102); + + /* Missing period-end-trigger at fn=200, SDCCH/8, TS0, SS7 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[7]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 94; + rc = is_meas_overdue(lchan, &fn_missed_end, 43 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 8 + 102); + + /* No dropout, SDCCH/8, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 47; + rc = is_meas_overdue(lchan, &fn_missed_end, 66); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 51; + rc = is_meas_overdue(lchan, &fn_missed_end, 70); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 55; + rc = is_meas_overdue(lchan, &fn_missed_end, 74); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 59; + rc = is_meas_overdue(lchan, &fn_missed_end, 78); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS4 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[4]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 82; + rc = is_meas_overdue(lchan, &fn_missed_end, 98); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS5 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[5]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 86; + rc = is_meas_overdue(lchan, &fn_missed_end, 102); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS6 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[6]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 90; + rc = is_meas_overdue(lchan, &fn_missed_end, 4 + 102); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/8, TS0, SS7 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[7]; + lchan->ts->pchan = GSM_PCHAN_SDCCH8_SACCH8C; + lchan->meas.last_fn = 94; + rc = is_meas_overdue(lchan, &fn_missed_end, 8 + 102); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* Missing period-end-trigger at fn=88, SDCCH/4, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 57; + rc = is_meas_overdue(lchan, &fn_missed_end, 37 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 88); + + /* Missing period-end-trigger at fn=92, SDCCH/4, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 61; + rc = is_meas_overdue(lchan, &fn_missed_end, 41 + 102); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 92); + + /* Missing period-end-trigger at fn=6, SDCCH/4, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = GSM_MAX_FN - 102 + 98; + rc = is_meas_overdue(lchan, &fn_missed_end, 47); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 6); + + /* Missing period-end-trigger at fn=10, SDCCH/4, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 0; + rc = is_meas_overdue(lchan, &fn_missed_end, 51); + OSMO_ASSERT(rc); + OSMO_ASSERT(fn_missed_end == 10); + + /* No dropout, SDCCH/4, TS0, SS0 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[0]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 57; + rc = is_meas_overdue(lchan, &fn_missed_end, 88); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/4, TS0, SS1 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[1]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 61; + rc = is_meas_overdue(lchan, &fn_missed_end, 92); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/4, TS0, SS2 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[2]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = GSM_MAX_FN - 102 + 98; + rc = is_meas_overdue(lchan, &fn_missed_end, 6); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); + + /* No dropout, SDCCH/4, TS0, SS3 */ + fn_missed_end = LCHAN_FN_DUMMY; + lchan = &trx->ts[0].lchan[3]; + lchan->ts->pchan = GSM_PCHAN_CCCH_SDCCH4; + lchan->meas.last_fn = 0; + rc = is_meas_overdue(lchan, &fn_missed_end, 10); + OSMO_ASSERT(!rc); + OSMO_ASSERT(fn_missed_end == LCHAN_FN_DUMMY); } static void test_is_meas_complete_single(struct gsm_lchan *lchan, -- To view, visit https://gerrit.osmocom.org/10654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5d555a21003943bf720c53f3a611029ba45339a9 Gerrit-Change-Number: 10654 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:04:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:04:59 +0000 Subject: Change in osmo-bts[master]: cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10655 ) Change subject: cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s ...................................................................... cosmetic: rename *_meas_rep_fn10* to *_meas_rep_fn10*_by_*s The lookup table that control the measurement interval endings do not make clear what their indexes refer to. Lets give them more distinct names. rename sdcch8_meas_rep_fn102 to sdcch8_meas_rep_fn102_by_ss rename sdcch4_meas_rep_fn102 to sdcch4_meas_rep_fn102_by_ss rename tchf_meas_rep_fn104 to tchf_meas_rep_fn104_by_ts rename tchh0_meas_rep_fn104 to tchh0_meas_rep_fn104_by_ts rename tchh1_meas_rep_fn104 to tchh1_meas_rep_fn104_by_ts Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Related: OS#2975 --- M src/common/measurement.c 1 file changed, 16 insertions(+), 16 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/measurement.c b/src/common/measurement.c index 7b41437..d7580e6 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -120,7 +120,7 @@ * Note: The array index of the following three lookup tables refes to a * timeslot number. */ -static const uint8_t tchf_meas_rep_fn104[] = { +static const uint8_t tchf_meas_rep_fn104_by_ts[] = { [0] = 90, [1] = 103, [2] = 12, @@ -130,7 +130,7 @@ [6] = 64, [7] = 77, }; -static const uint8_t tchh0_meas_rep_fn104[] = { +static const uint8_t tchh0_meas_rep_fn104_by_ts[] = { [0] = 90, [1] = 90, [2] = 12, @@ -140,7 +140,7 @@ [6] = 64, [7] = 64, }; -static const uint8_t tchh1_meas_rep_fn104[] = { +static const uint8_t tchh1_meas_rep_fn104_by_ts[] = { [0] = 103, [1] = 103, [2] = 25, @@ -165,7 +165,7 @@ * subslot number. */ /* FN of the first burst whose block completes before reaching fn%102=11 */ -static const uint8_t sdcch8_meas_rep_fn102[] = { +static const uint8_t sdcch8_meas_rep_fn102_by_ss[] = { [0] = 66, /* 15(SDCCH), 47(SACCH), 66(SDCCH) */ [1] = 70, /* 19(SDCCH), 51(SACCH), 70(SDCCH) */ [2] = 74, /* 23(SDCCH), 55(SACCH), 74(SDCCH) */ @@ -177,7 +177,7 @@ }; /* FN of the first burst whose block completes before reaching fn%102=37 */ -static const uint8_t sdcch4_meas_rep_fn102[] = { +static const uint8_t sdcch4_meas_rep_fn102_by_ss[] = { [0] = 88, /* 37(SDCCH), 57(SACCH), 88(SDCCH) */ [1] = 92, /* 41(SDCCH), 61(SACCH), 92(SDCCH) */ [2] = 6, /* 6(SACCH), 47(SDCCH), 98(SDCCH) */ @@ -196,7 +196,7 @@ * Table 1 of 9) what value we need to feed into the lookup tables in order to * detect the measurement period ending. In this example the "real" ending * was on FN%104=12. This is the value we have to look for in - * tchf_meas_rep_fn104 to know that a measurement period has just ended. */ + * tchf_meas_rep_fn104_by_ts to know that a measurement period has just ended. */ /* See also 3GPP TS 05.02 Clause 7 Table 1 of 9: * Mapping of logical channels onto physical channels (see subclauses 6.3, 6.4, 6.5) */ @@ -269,28 +269,28 @@ switch (pchan) { case GSM_PCHAN_TCH_F: fn_mod = translate_tch_meas_rep_fn104(fn % 104); - if (tchf_meas_rep_fn104[lchan->ts->nr] == fn_mod) + if (tchf_meas_rep_fn104_by_ts[lchan->ts->nr] == fn_mod) rc = 1; break; case GSM_PCHAN_TCH_H: fn_mod = translate_tch_meas_rep_fn104(fn % 104); if (lchan->nr == 0) - tbl = tchh0_meas_rep_fn104; + tbl = tchh0_meas_rep_fn104_by_ts; else - tbl = tchh1_meas_rep_fn104; + tbl = tchh1_meas_rep_fn104_by_ts; if (tbl[lchan->ts->nr] == fn_mod) rc = 1; break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: fn_mod = fn % 102; - if (sdcch8_meas_rep_fn102[lchan->nr] == fn_mod) + if (sdcch8_meas_rep_fn102_by_ss[lchan->nr] == fn_mod) rc = 1; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: fn_mod = fn % 102; - if (sdcch4_meas_rep_fn102[lchan->nr] == fn_mod) + if (sdcch4_meas_rep_fn102_by_ss[lchan->nr] == fn_mod) rc = 1; break; default: @@ -333,27 +333,27 @@ switch (pchan) { case GSM_PCHAN_TCH_F: modulus = 104; - interval_end = tchf_meas_rep_fn104[lchan->ts->nr]; + interval_end = tchf_meas_rep_fn104_by_ts[lchan->ts->nr]; interval_end = translate_tch_meas_rep_fn104_inv(interval_end); break; case GSM_PCHAN_TCH_H: modulus = 104; if (lchan->nr == 0) - tbl = tchh0_meas_rep_fn104; + tbl = tchh0_meas_rep_fn104_by_ts; else - tbl = tchh1_meas_rep_fn104; + tbl = tchh1_meas_rep_fn104_by_ts; interval_end = tbl[lchan->ts->nr]; interval_end = translate_tch_meas_rep_fn104_inv(interval_end); break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: modulus = 102; - interval_end = sdcch8_meas_rep_fn102[lchan->nr]; + interval_end = sdcch8_meas_rep_fn102_by_ss[lchan->nr]; break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: modulus = 102; - interval_end = sdcch4_meas_rep_fn102[lchan->nr]; + interval_end = sdcch4_meas_rep_fn102_by_ss[lchan->nr]; break; default: return false; -- To view, visit https://gerrit.osmocom.org/10655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3dc891e1860109f803c1bfa46445e8fef35586d9 Gerrit-Change-Number: 10655 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:05:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:05:00 +0000 Subject: Change in osmo-bts[master]: cosmetic: test_is_meas_overdue() does not test is_meas_complete() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10666 ) Change subject: cosmetic: test_is_meas_overdue() does not test is_meas_complete() ...................................................................... cosmetic: test_is_meas_overdue() does not test is_meas_complete() The function is_meas_overdue() does not use is_meas_complete() anymore and therefore the related log output is wrong. Lets correct this. Change-Id: I9b7aa2f7a7c75bc3eed0c94b6ef9d17e7e36ce96 Related: OS#2975 --- M tests/meas/meas_test.c M tests/meas/meas_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index 680c1c3..b90227a 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -127,7 +127,7 @@ printf("\n\n"); printf("===========================================================\n"); - printf("Testing is_meas_overdue() and is_meas_complete()\n"); + printf("Testing is_meas_overdue()\n"); /* Missing period-end-trigger at fn=12, TCH/F, TS0 */ fn_missed_end = LCHAN_FN_DUMMY; diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index ac32acf..58e527a 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -580,7 +580,7 @@ =========================================================== -Testing is_meas_overdue() and is_meas_complete() +Testing is_meas_overdue() =========================================================== -- To view, visit https://gerrit.osmocom.org/10666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b7aa2f7a7c75bc3eed0c94b6ef9d17e7e36ce96 Gerrit-Change-Number: 10666 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:06:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:06:18 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: Add systemd service file and install with debian In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10693 ) Change subject: ctrl2cgi: Add systemd service file and install with debian ...................................................................... Patch Set 1: Code-Review+2 I think for the average user it would be great if it was called omso-* to know it relates to the osmocom stack. otherwise, fine with me. -- To view, visit https://gerrit.osmocom.org/10693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 Gerrit-Change-Number: 10693 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 17:06:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:06:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:06:37 +0000 Subject: Change in openbsc[master]: Add osmo-bsc-nat systemd service and install it with debian In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10691 ) Change subject: Add osmo-bsc-nat systemd service and install it with debian ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29d719fbe059e38fde97371efc5e562901529b7c Gerrit-Change-Number: 10691 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 29 Aug 2018 17:06:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:06:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 29 Aug 2018 17:06:39 +0000 Subject: Change in openbsc[master]: Add osmo-bsc-nat systemd service and install it with debian In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10691 ) Change subject: Add osmo-bsc-nat systemd service and install it with debian ...................................................................... Add osmo-bsc-nat systemd service and install it with debian Change-Id: I29d719fbe059e38fde97371efc5e562901529b7c --- A debian/osmocom-bsc-nat.service A openbsc/contrib/systemd/osmo-bsc-nat.service 2 files changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmocom-bsc-nat.service b/debian/osmocom-bsc-nat.service new file mode 120000 index 0000000..0d5b3be --- /dev/null +++ b/debian/osmocom-bsc-nat.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-bsc-nat.service \ No newline at end of file diff --git a/openbsc/contrib/systemd/osmo-bsc-nat.service b/openbsc/contrib/systemd/osmo-bsc-nat.service new file mode 100644 index 0000000..245fc6b --- /dev/null +++ b/openbsc/contrib/systemd/osmo-bsc-nat.service @@ -0,0 +1,11 @@ +[Unit] +Description=Osmocom GSM BSC Multiplexer (NAT) + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-bsc_nat -c /etc/osmocom/osmo-bsc-nat.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/10691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I29d719fbe059e38fde97371efc5e562901529b7c Gerrit-Change-Number: 10691 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 17:14:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 29 Aug 2018 17:14:55 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: Add systemd service file and install with debian In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10693 to look at the new patch set (#2). Change subject: ctrl2cgi: Add systemd service file and install with debian ...................................................................... ctrl2cgi: Add systemd service file and install with debian Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 --- A contrib/systemd/osmo-ctrl2cgi.service A debian/python3-osmopy-utils.osmo-ctrl2cgi.service M debian/rules 3 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/93/10693/2 -- To view, visit https://gerrit.osmocom.org/10693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 Gerrit-Change-Number: 10693 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 18:37:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 29 Aug 2018 18:37:08 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10697 Change subject: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion ...................................................................... OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f --- M OsmoSIPConnector/chapters/configuration.adoc 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/97/10697/1 diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc index 0a9a51f..24ac3a5 100644 --- a/OsmoSIPConnector/chapters/configuration.adoc +++ b/OsmoSIPConnector/chapters/configuration.adoc @@ -16,8 +16,8 @@ .Example: MNCC configuration ---- -OsmoMGW(config)# mncc -OsmoMGW(config-mncc)# socket-path /tmp/msc_mncc +OsmoSIPcon(config)# mncc +OsmoSIPcon(config-mncc)# socket-path /tmp/msc_mncc ---- === Configuring SIP @@ -27,9 +27,9 @@ .Example: SIP configuration ---- -OsmoMGW(config)# sip -OsmoMGW(config-sip)# local 10.0.0.1 5060 <1> -OsmoMGW(config-sip)# remote 10.0.0.2 5060 <2> +OsmoSIPcon(config)# sip +OsmoSIPcon(config-sip)# local 10.0.0.1 5060 <1> +OsmoSIPcon(config-sip)# remote 10.0.0.2 5060 <2> ---- <1> The local IP/port to use <2> The remote SIP IP/port that the PBX uses @@ -39,8 +39,8 @@ .Example: Use IMSI instead of MSISDN ---- -OsmoMGW(config)# app -OsmoMGW(config-app)# use-imsi <1> +OsmoSIPcon(config)# app +OsmoSIPcon(config-app)# use-imsi <1> ---- <1> Use the IMSI for MO calling and MT called address -- To view, visit https://gerrit.osmocom.org/10697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f Gerrit-Change-Number: 10697 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Aug 29 18:51:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 29 Aug 2018 18:51:24 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/10698 Change subject: osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg ...................................................................... osmo-bts-trx/l1_if.c: cosmetic: fix typo in debug msg There is a big difference between both L1 and L2 frames. In the first case, a TDMA frame is assumed, while a L2 frame is the result of decoding a few bursts (e.g. 4 for xCCH) arrived on a few TDMA frames. Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c --- M src/osmo-bts-trx/l1_if.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/10698/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 23fc196..559dc1e 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -509,7 +509,7 @@ /* 100% BER is n_bits_total is 0 */ float ber = n_bits_total==0 ? 1.0 : (float)n_errors / (float)n_bits_total; - LOGPFN(DMEAS, LOGL_DEBUG, fn, "RX L1 frame %s fn=%u chan_nr=0x%02x MS pwr=%ddBm rssi=%.1f dBFS " + LOGPFN(DMEAS, LOGL_DEBUG, fn, "RX L2 frame %s fn=%u chan_nr=0x%02x MS pwr=%ddBm rssi=%.1f dBFS " "ber=%.2f%% (%d/%d bits) L1_ta=%d rqd_ta=%d toa256=%d\n", gsm_lchan_name(lchan), fn, chan_nr, ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power_ctrl.current), rssi, ber*100, n_errors, n_bits_total, lchan->meas.l1_info[1], lchan->rqd_ta, toa256); -- To view, visit https://gerrit.osmocom.org/10698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4362c2869e658c2f42664b4009a30e777f8048c Gerrit-Change-Number: 10698 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 02:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 30 Aug 2018 02:56:11 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: no need to clear mr again Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10699 Change subject: cosmetic: lchan activ: no need to clear mr again ...................................................................... cosmetic: lchan activ: no need to clear mr again In lchan state UNUSED, on activating an lchan, we zero out the lchan->mr_ms_lv and mr_bts_lv. However, in UNUSED's onenter function, we already called lchan_reset(), clearing out the lchan completely. Drop two lines of unnecessary code. Change-Id: I8b38f222f1c8c822e8e5e776850dbc60e30e8b8d --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/10699/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 13ae7ad..28dc846 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -460,8 +460,6 @@ }; lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); lchan->bs_power = 0; /* 0dB reduction, output power = Pn */ - memset(&lchan->mr_ms_lv, 0, sizeof(lchan->mr_ms_lv)); - memset(&lchan->mr_bts_lv, 0, sizeof(lchan->mr_bts_lv)); } if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) -- To view, visit https://gerrit.osmocom.org/10699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8b38f222f1c8c822e8e5e776850dbc60e30e8b8d Gerrit-Change-Number: 10699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 02:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 30 Aug 2018 02:56:12 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: drop todo comments Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10700 Change subject: cosmetic: lchan activ: drop todo comments ...................................................................... cosmetic: lchan activ: drop todo comments Drop the todo comments about "for_conn->encr". I have intended that as an idea to store encryption info in the conn instead of the lchan, which might make sense, but there's no use in these comments. Change-Id: I47e90062c784dd7919fff3115e2bee3314b30cd5 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/10700/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 28dc846..3352da5 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -447,14 +447,12 @@ lchan->activate.re_use_mgw_endpoint_from_lchan = info->old_lchan; if (info->old_lchan) { - /* TODO: rather take info->for_conn->encr? */ lchan->encr = info->old_lchan->encr; lchan->ms_power = info->old_lchan->ms_power; lchan->bs_power = info->old_lchan->bs_power; lchan->rqd_ta = info->old_lchan->rqd_ta; } else { struct gsm_bts *bts = lchan->ts->trx->bts; - /* TODO: rather take info->for_conn->encr? */ lchan->encr = (struct gsm_encr){ .alg_id = RSL_ENC_ALG_A5(0), /* no encryption */ }; -- To view, visit https://gerrit.osmocom.org/10700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I47e90062c784dd7919fff3115e2bee3314b30cd5 Gerrit-Change-Number: 10700 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 02:56:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 30 Aug 2018 02:56:12 +0000 Subject: Change in osmo-bsc[master]: lchan: pick proper power and ta values Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/10701 Change subject: lchan: pick proper power and ta values ...................................................................... lchan: pick proper power and ta values When activating an lchan, the power levels should be maximum and TA zero. Only if a new lchan is assigned within the same cell does it make sense to take over the previous power and TA levels. In LCHAN_EV_ACTIVATE: - Separate the code that copies previous encryption data. This should happen regardless of whether we're staying in the same cell or not. - For the power,TA levels, take over an old lchan's values only when it is assigning a new lchan in the same cell. Change-Id: I360b003398487fa6f934296ff03643c33ec61a35 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/10701/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 3352da5..7d47380 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -429,6 +429,8 @@ { struct lchan_activate_info *info = data; struct gsm_lchan *lchan = lchan_fi_lchan(fi); + struct gsm_bts *bts = lchan->ts->trx->bts; + switch (event) { case LCHAN_EV_ACTIVATE: @@ -446,18 +448,25 @@ lchan->activate.concluded = false; lchan->activate.re_use_mgw_endpoint_from_lchan = info->old_lchan; - if (info->old_lchan) { + if (info->old_lchan) lchan->encr = info->old_lchan->encr; + else { + lchan->encr = (struct gsm_encr){ + .alg_id = RSL_ENC_ALG_A5(0), /* no encryption */ + }; + } + + /* If there is a previous lchan, and the new lchan is on the same cell as previous one, + * take over power and TA values. Otherwise, use max power and zero TA. */ + if (info->old_lchan && info->old_lchan->ts->trx->bts == bts) { lchan->ms_power = info->old_lchan->ms_power; lchan->bs_power = info->old_lchan->bs_power; lchan->rqd_ta = info->old_lchan->rqd_ta; } else { - struct gsm_bts *bts = lchan->ts->trx->bts; - lchan->encr = (struct gsm_encr){ - .alg_id = RSL_ENC_ALG_A5(0), /* no encryption */ - }; lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); - lchan->bs_power = 0; /* 0dB reduction, output power = Pn */ + /* From lchan_reset(): + * - bs_power is still zero, 0dB reduction, output power = Pn. + * - TA is still zero, to be determined by RACH. */ } if (info->chan_mode == GSM48_CMODE_SPEECH_AMR) -- To view, visit https://gerrit.osmocom.org/10701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I360b003398487fa6f934296ff03643c33ec61a35 Gerrit-Change-Number: 10701 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 07:00:46 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 30 Aug 2018 07:00:46 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/10697 ) Change subject: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion ...................................................................... Patch Set 1: Code-Review+1 Thanks for catching that! -- To view, visit https://gerrit.osmocom.org/10697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f Gerrit-Change-Number: 10697 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 30 Aug 2018 07:00:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 07:04:38 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 30 Aug 2018 07:04:38 +0000 Subject: Change in osmo-bts[master]: measurement: add SUB measurements in test_lchan_meas_process_measurement In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10694 to look at the new patch set (#2). Change subject: measurement: add SUB measurements in test_lchan_meas_process_measurement ...................................................................... measurement: add SUB measurements in test_lchan_meas_process_measurement The unit-test function test_lchan_meas_process_measurement() does not tag measurements as SUB. Lets make the test function more realistic by setting the is_sub flag at the correct positions. - Add SUB-Measurements in the correct position - Print log lines when adding measurements for sub, also fix minor bugs in the log printing. Change-Id: I25c361b21a406c0017ee586f0492c38f2e737e57 Related: OS#3502 Related: OS#2975 --- M tests/meas/meas_test.c M tests/meas/meas_test.ok 2 files changed, 66 insertions(+), 417 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/10694/2 -- To view, visit https://gerrit.osmocom.org/10694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I25c361b21a406c0017ee586f0492c38f2e737e57 Gerrit-Change-Number: 10694 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 09:54:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 09:54:40 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: no need to clear mr again In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10699 ) Change subject: cosmetic: lchan activ: no need to clear mr again ...................................................................... Patch Set 1: Could we please stop tagging these commits as cosmetic? They are not cosmetic, they change the generated binary, they change the logic, etc. -- To view, visit https://gerrit.osmocom.org/10699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b38f222f1c8c822e8e5e776850dbc60e30e8b8d Gerrit-Change-Number: 10699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 30 Aug 2018 09:54:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 09:55:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 09:55:20 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: drop todo comments In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10700 ) Change subject: cosmetic: lchan activ: drop todo comments ...................................................................... Patch Set 1: This one is fine as cosmetic for instance. -- To view, visit https://gerrit.osmocom.org/10700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47e90062c784dd7919fff3115e2bee3314b30cd5 Gerrit-Change-Number: 10700 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 30 Aug 2018 09:55:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 10:03:01 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 30 Aug 2018 10:03:01 +0000 Subject: Change in osmo-sip-connector[master]: wip Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10702 Change subject: wip ...................................................................... wip Change-Id: I4e68bda2e7dc6842de1bbe2849097537ad84e8f6 --- M src/call.h M src/mncc.c M src/sip.c 3 files changed, 81 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/02/10702/1 diff --git a/src/call.h b/src/call.h index 5a11f6c..eb9ef66 100644 --- a/src/call.h +++ b/src/call.h @@ -43,6 +43,7 @@ struct call *call; bool in_release; + int cause; /** * RTP data @@ -130,6 +131,7 @@ int rsp_wanted; struct mncc_connection *conn; + int cause; }; extern struct llist_head g_call_list; diff --git a/src/mncc.c b/src/mncc.c index 2ecf8d0..9be010d 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -105,13 +105,19 @@ static void mncc_fill_header(struct gsm_mncc *mncc, uint32_t msg_type, uint32_t callref) { + + struct mncc_call_leg *mncc_leg; + mncc_leg = mncc_find_leg(callref); + mncc->msg_type = msg_type; mncc->callref = callref; if (MNCC_DISC_REQ == msg_type || MNCC_REL_REQ == msg_type) { mncc->fields |= MNCC_F_CAUSE; mncc->cause.coding = GSM48_CAUSE_CODING_GSM; mncc->cause.location = GSM48_CAUSE_LOC_PUN_S_LU; + mncc->cause.value = mncc_leg->base.cause; } + } static void mncc_write(struct mncc_connection *conn, struct gsm_mncc *mncc, uint32_t callref) @@ -134,6 +140,10 @@ struct gsm_mncc mncc = { 0, }; mncc_fill_header(&mncc, msg_type, callref); + + LOGP(DMNCC, LOGL_DEBUG, "%s() message type: %s cause: %u\n", + __func__, osmo_mncc_name(msg_type), mncc.cause.value); + mncc_write(conn, &mncc, callref); } @@ -260,7 +270,7 @@ case MNCC_CC_PROCEEDING: case MNCC_CC_CONNECTED: LOGP(DMNCC, LOGL_DEBUG, - "Releasing call in non-initial leg(%u)\n", leg->callref); + "Releasing call in non-initial leg(%u) cause(%d)\n", leg->callref, leg->base.cause); leg->base.in_release = true; start_cmd_timer(leg, MNCC_REL_IND); mncc_send(leg->conn, MNCC_DISC_REQ, leg->callref); @@ -381,6 +391,7 @@ /* TODO.. now we can continue with the call */ struct in_addr net = { .s_addr = htonl(leg->base.ip) }; + LOGP(DMNCC, LOGL_DEBUG, "RTP cnt leg(%u) ip(%s), port(%u) pt(%u) ptm(%u)\n", leg->callref, inet_ntoa(net), leg->base.port, @@ -490,6 +501,7 @@ return NULL; } + return leg; } @@ -503,6 +515,8 @@ if (!leg) return; + LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %d\n", data->cause.value); + LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was disconnected. Releasing\n", data->callref); leg->base.in_release = true; @@ -511,6 +525,7 @@ other_leg = call_leg_other(&leg->base); if (other_leg) + other_leg->cause = data->cause.value; other_leg->release_call(other_leg); } @@ -520,15 +535,19 @@ struct mncc_call_leg *leg; leg = find_leg(conn, buf, rc, &data); + if (!leg) return; + LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %d\n", data->cause.value); + if (leg->base.in_release) stop_cmd_timer(leg, MNCC_REL_IND); else { struct call_leg *other_leg; other_leg = call_leg_other(&leg->base); if (other_leg) + other_leg->cause = data->cause.value; other_leg->release_call(other_leg); } LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was released.\n", data->callref); diff --git a/src/sip.c b/src/sip.c index 84d1f6e..141dc99 100644 --- a/src/sip.c +++ b/src/sip.c @@ -51,7 +51,7 @@ if (status == 183) sdp_extract_sdp(leg, sip, false); - LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now rining.\n", leg); + LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now ringing.\n", leg); other->ring_call(other); } @@ -150,8 +150,8 @@ void nua_callback(nua_event_t event, int status, char const *phrase, nua_t *nua, nua_magic_t *magic, nua_handle_t *nh, nua_hmagic_t *hmagic, sip_t const *sip, tagi_t tags[]) { - LOGP(DSIP, LOGL_DEBUG, "SIP event(%u) status(%d) phrase(%s) %p\n", - event, status, phrase, hmagic); + LOGP(DSIP, LOGL_DEBUG, "%s(): SIP event(%u) status(%d) phrase(%s) %p\n", + __func__, event, status, phrase, hmagic); if (event == nua_r_invite) { struct sip_call_leg *leg; @@ -170,13 +170,29 @@ else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); - LOGP(DSIP, LOGL_ERROR, "leg(%p) unknown err, releasing.\n", leg); + LOGP(DSIP, LOGL_ERROR, "leg(%p) unknown error code (%d), releasing.\n", leg, status); nua_cancel(leg->nua_handle, TAG_END()); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); - if (other) + if (other) { + LOGP(DSIP, LOGL_ERROR, "Releasing other leg (%p) with status(%d)\n", other, status); + switch (status) { + case 404: + other->cause = GSM48_CC_CAUSE_UNASSIGNED_NR; + break; + case 502: + case 480: + other->cause = GSM48_CC_CAUSE_NO_ROUTE; + break; + case 486: + other->cause = GSM48_CC_CAUSE_USER_BUSY; + break; + default: + other->cause = GSM48_CC_CAUSE_NORM_CALL_CLEAR; + } other->release_call(other); + } } } else if (event == nua_r_bye || event == nua_r_cancel) { /* our bye or hang up is answered */ @@ -214,13 +230,25 @@ call_leg_release(&leg->base); if (other) other->release_call(other); + } else { + LOGP(DSIP, LOGL_ERROR, "Did nothing with event(%u) status(%d)\n", event, status); } } +static void copy_cause_phrase(int *to_cause, char **to_phrase, + int from_cause, const char *from_phrase) +{ + *to_cause = from_cause; + *to_phrase = (char *)from_phrase; +} static void sip_release_call(struct call_leg *_leg) { struct sip_call_leg *leg; + char reason[64]; + char *sip_phrase; + char *reason_text; + int sip_cause; OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); leg = (struct sip_call_leg *) _leg; @@ -231,6 +259,30 @@ * and for a connected one bye. I don't see how sofia-sip is going * to help us here. */ + + LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%d)\n", __func__, _leg->cause); + + switch (_leg->cause) { + case GSM48_CC_CAUSE_NORM_CALL_CLEAR: + copy_cause_phrase(&sip_cause, &sip_phrase, SIP_200_OK); + reason_text = "Normal Call Clearing"; + break; + case GSM48_CC_CAUSE_DEST_OOO: + copy_cause_phrase(&sip_cause, &sip_phrase, SIP_502_BAD_GATEWAY); + reason_text = "Destination out of Order"; + break; + case GSM48_CC_CAUSE_USER_BUSY: + copy_cause_phrase(&sip_cause, &sip_phrase, SIP_486_BUSY_HERE); + reason_text = "User Busy"; + break; + default: + sip_cause = 502; + sip_phrase = ""; + reason_text = ""; + } + + snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text); + switch (leg->state) { case SIP_CC_INITIAL: LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in int state\n", leg); @@ -242,7 +294,8 @@ if (leg->dir == SIP_DIR_MT) nua_cancel(leg->nua_handle, TAG_END()); else { - nua_respond(leg->nua_handle, SIP_486_BUSY_HERE, + nua_respond(leg->nua_handle, sip_cause, sip_phrase, + SIPTAG_REASON_STR(reason), TAG_END()); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); -- To view, visit https://gerrit.osmocom.org/10702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4e68bda2e7dc6842de1bbe2849097537ad84e8f6 Gerrit-Change-Number: 10702 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 10:15:34 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 30 Aug 2018 10:15:34 +0000 Subject: Change in osmo-bts[master]: measurement: substitue missing measurements In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/10476 ) Change subject: measurement: substitue missing measurements ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd30fc07603ad7d042c1fb416e247c3bf7d35c8b Gerrit-Change-Number: 10476 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 30 Aug 2018 10:15:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:09:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 12:09:34 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Add quotes to string to fix shellcheck warning Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10703 Change subject: osmo-release.sh: Add quotes to string to fix shellcheck warning ...................................................................... osmo-release.sh: Add quotes to string to fix shellcheck warning Change-Id: I40376c99d44552d9b8023fca8d319a9312b0fbb0 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/10703/1 diff --git a/osmo-release.sh b/osmo-release.sh index 86b41d8..1e5a203 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -4,7 +4,7 @@ if [ "z$REL" = "z" ]; then echo "No REL value specified, defaulting to 'patch' release" - REL=patch + REL="patch" fi BUMPVER=`command -v bumpversion` -- To view, visit https://gerrit.osmocom.org/10703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I40376c99d44552d9b8023fca8d319a9312b0fbb0 Gerrit-Change-Number: 10703 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:09:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 12:09:35 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Allow forcing release without LIBVERSION bump Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10704 Change subject: osmo-release.sh: Allow forcing release without LIBVERSION bump ...................................................................... osmo-release.sh: Allow forcing release without LIBVERSION bump Sometimes a fix release may be required which only contains fixes to parts not related to a shared library, for instance a fix in the build system. Thus allow releasing without bumping LIBVERSION, but only through env var setting for people who know what they are doing. Change-Id: I91e186d47638038bc2968ea0178879365ffc9512 --- M osmo-release.sh 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/10704/1 diff --git a/osmo-release.sh b/osmo-release.sh index 1e5a203..26ebd33 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -7,6 +7,8 @@ REL="patch" fi +ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" + BUMPVER=`command -v bumpversion` NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -27,12 +29,13 @@ echo "Releasing $VERSION -> $NEW_VER..." if [ "z$LIBVERS" != "z" ]; then - if [ "z$MAKEMOD" = "z" ]; then - echo "Before releasing, please modify some of the libversions: $LIBVERS" + if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then + echo "ERROR: Before releasing, please modify some of the libversions: $LIBVERS" echo "You should NOT be doing this unless you've read and understood following article:" echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" exit 1 fi + if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/10704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I91e186d47638038bc2968ea0178879365ffc9512 Gerrit-Change-Number: 10704 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:09:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 12:09:35 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Add checks to help avoid libversion debian major mis... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10705 Change subject: osmo-release.sh: Add checks to help avoid libversion debian major mismatch ...................................................................... osmo-release.sh: Add checks to help avoid libversion debian major mismatch Change-Id: Ie0f6a2f9d60908b36f90921bfba3fc31606e5027 --- M osmo-release.sh 1 file changed, 39 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/10705/1 diff --git a/osmo-release.sh b/osmo-release.sh index 26ebd33..4d4d080 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -8,9 +8,19 @@ fi ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" +ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" + +libversion_to_deb_major() { + libversion="$1" + current="$(echo "$libversion" | cut -d ":" -f 1)" + #revision="$(echo "$libversion" | cut -d ":" -f 2)" + age="$(echo "$libversion" | cut -d ":" -f 3)" + major="$(expr "$current" - "$age")" + echo "$major" +} BUMPVER=`command -v bumpversion` - +GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` @@ -35,7 +45,34 @@ echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" exit 1 fi - + if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then + echo "$LIBVERS" | while read -r line; do + libversion=$(echo "$line" | cut -d "=" -f 2) + major="$(libversion_to_deb_major "$libversion")" + file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" + if [ "z$file_matches" = "z0" ]; then + echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" + exit 1 + elif [ "z$file_matches" = "z1" ]; then + echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" + fi + control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" + fi + done + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + exit 1 + fi + fi if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/10705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0f6a2f9d60908b36f90921bfba3fc31606e5027 Gerrit-Change-Number: 10705 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:27:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 12:27:08 +0000 Subject: Change in libosmo-abis[master]: debian: Fix libosmoabis soname package version Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10706 Change subject: debian: Fix libosmoabis soname package version ...................................................................... debian: Fix libosmoabis soname package version LIBVERSION for libosmoabis was increased during v0.4.0 release, but didn't update the debian package name accordingly to match major. Change-Id: I7ead154d72e6dadf795414c47fe276edadd08580 Fixes: OS#3365 --- M debian/control R debian/libosmoabis6.install 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/06/10706/1 diff --git a/debian/control b/debian/control index 10295e6..9a4b27d 100644 --- a/debian/control +++ b/debian/control @@ -21,13 +21,13 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis5 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis6 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one package per DSO. -Package: libosmoabis5 +Package: libosmoabis6 Section: libs Architecture: any Multi-Arch: same @@ -59,7 +59,7 @@ Section: libdevel Depends: ${misc:Depends}, libosmotrau2 (= ${binary:Version}), - libosmoabis5 (= ${binary:Version}) + libosmoabis6 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis interface between GSM BTS and BSC. This package in particular contains the @@ -71,7 +71,7 @@ Multi-Arch: same Section: debug Priority: extra -Depends: libosmoabis5 (= ${binary:Version}), +Depends: libosmoabis6 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface diff --git a/debian/libosmoabis5.install b/debian/libosmoabis6.install similarity index 100% rename from debian/libosmoabis5.install rename to debian/libosmoabis6.install -- To view, visit https://gerrit.osmocom.org/10706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7ead154d72e6dadf795414c47fe276edadd08580 Gerrit-Change-Number: 10706 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:44:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:44:08 +0000 Subject: Change in libosmo-abis[master]: debian: Fix libosmoabis soname package version In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10706 ) Change subject: debian: Fix libosmoabis soname package version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ead154d72e6dadf795414c47fe276edadd08580 Gerrit-Change-Number: 10706 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 12:44:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:44:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:44:10 +0000 Subject: Change in libosmo-abis[master]: debian: Fix libosmoabis soname package version In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10706 ) Change subject: debian: Fix libosmoabis soname package version ...................................................................... debian: Fix libosmoabis soname package version LIBVERSION for libosmoabis was increased during v0.4.0 release, but didn't update the debian package name accordingly to match major. Change-Id: I7ead154d72e6dadf795414c47fe276edadd08580 Fixes: OS#3365 --- M debian/control R debian/libosmoabis6.install 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 10295e6..9a4b27d 100644 --- a/debian/control +++ b/debian/control @@ -21,13 +21,13 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis5 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis6 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one package per DSO. -Package: libosmoabis5 +Package: libosmoabis6 Section: libs Architecture: any Multi-Arch: same @@ -59,7 +59,7 @@ Section: libdevel Depends: ${misc:Depends}, libosmotrau2 (= ${binary:Version}), - libosmoabis5 (= ${binary:Version}) + libosmoabis6 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis interface between GSM BTS and BSC. This package in particular contains the @@ -71,7 +71,7 @@ Multi-Arch: same Section: debug Priority: extra -Depends: libosmoabis5 (= ${binary:Version}), +Depends: libosmoabis6 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface diff --git a/debian/libosmoabis5.install b/debian/libosmoabis6.install similarity index 100% rename from debian/libosmoabis5.install rename to debian/libosmoabis6.install -- To view, visit https://gerrit.osmocom.org/10706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7ead154d72e6dadf795414c47fe276edadd08580 Gerrit-Change-Number: 10706 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:44:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:44:21 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Add quotes to string to fix shellcheck warning In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10703 ) Change subject: osmo-release.sh: Add quotes to string to fix shellcheck warning ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40376c99d44552d9b8023fca8d319a9312b0fbb0 Gerrit-Change-Number: 10703 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 12:44:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:44:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:44:42 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Allow forcing release without LIBVERSION bump In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10704 ) Change subject: osmo-release.sh: Allow forcing release without LIBVERSION bump ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91e186d47638038bc2968ea0178879365ffc9512 Gerrit-Change-Number: 10704 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 12:44:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:44:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:44:50 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Add checks to help avoid libversion debian major mis... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10705 ) Change subject: osmo-release.sh: Add checks to help avoid libversion debian major mismatch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0f6a2f9d60908b36f90921bfba3fc31606e5027 Gerrit-Change-Number: 10705 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 12:44:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:45:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:45:50 +0000 Subject: Change in osmo-bts[master]: measurement: substitue missing measurements In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10476 ) Change subject: measurement: substitue missing measurements ...................................................................... measurement: substitue missing measurements At the moment the measurement calculation of osmo-bts works by collecting the measurement reports the phy emits during a measurement interval. Normally one would expect a well defind fixed number here, but some phys will not emit a measurement report for lost blocks. Also blocks and their reports may get lost because of cpu overload etc. The computation that is executed at the end of the measurement interval computes over all received measurement. This evenutally means that missing measurements will not taken into account and the result will look better than it is in reality. To fix this, the interval must be of a defined size and in cases where less measurements as expected were collected, the algorithm must assume they have been received with a 100%BER and take that into account. However, all RSSI and TA/TOA related computations should continue to rely on actual measurement data. - make sure the algorithm works over a fixed interval - replace missing measurements with 100%BER - fix and extend unit-tests Change-Id: Idd30fc07603ad7d042c1fb416e247c3bf7d35c8b Related: OS#2987 --- M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_test.ok M tests/meas/meas_testcases.h 4 files changed, 859 insertions(+), 96 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/measurement.c b/src/common/measurement.c index d7580e6..59f5d83 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -16,6 +16,21 @@ static const uint8_t ts45008_83_tch_hs0[] = { 0, 2, 4, 6, 52, 54, 56, 58 }; static const uint8_t ts45008_83_tch_hs1[] = { 14, 16, 18, 20, 66, 68, 70, 72 }; +/* In cases where we less measurements than we expect we must assume that we + * just did not receive the block because it was lost due to bad channel + * conditions. We set up a dummy measurement result here that reflects the + * worst possible result. In our* calculation we will use this dummy to replace + * the missing measurements */ +#define MEASUREMENT_DUMMY_BER 10000 /* 100% BER */ +#define MEASUREMENT_DUMMY_IRSSI 109 /* noise floor in -dBm */ +static const struct bts_ul_meas measurement_dummy = (struct bts_ul_meas) { + .ber10k = MEASUREMENT_DUMMY_BER, + .ta_offs_256bits = 0, + .c_i = 0, + .is_sub = 0, + .inv_rssi = MEASUREMENT_DUMMY_IRSSI +}; + /* find out if an array contains a given key as element */ #define ARRAY_CONTAINS(arr, val) array_contains(arr, ARRAY_SIZE(arr), val) static bool array_contains(const uint8_t *arr, unsigned int len, uint8_t val) { @@ -468,6 +483,64 @@ return 7; } +/* Get the number of measurements that we expect for a specific lchan. + * (This is a static number that is defined by the specific slot layout of + * the channel) */ +static unsigned int lchan_meas_num_expected(const struct gsm_lchan *lchan) +{ + enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); + + switch (pchan) { + case GSM_PCHAN_TCH_F: + /* 24 for TCH + 1 for SACCH */ + return 25; + case GSM_PCHAN_TCH_H: + /* 24 half-blocks for TCH + 1 for SACCH */ + return 25; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + /* 2 for SDCCH + 1 for SACCH */ + return 3; + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + /* 2 for SDCCH + 1 for SACCH */ + return 3; + default: + return lchan->meas.num_ul_meas; + } +} + +/* In DTX a subset of blocks must always be transmitted + * See also: GSM 05.08, chapter 8.3 Aspects of discontinuous transmission (DTX) */ +static unsigned int lchan_meas_sub_num_expected(const struct gsm_lchan *lchan) +{ + enum gsm_phys_chan_config pchan = ts_pchan(lchan->ts); + + /* AMR is using a more elaborated model with a dymanic amount of + * DTX blocks so this function is not applicable to determine the + * amount of expected SUB Measurements when AMR is used */ + OSMO_ASSERT(lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) + + switch (pchan) { + case GSM_PCHAN_TCH_F: + /* 1 block SDCCH, 2 blocks TCH */ + return 3; + case GSM_PCHAN_TCH_H: + /* 1 block SDCCH, 4 half-blocks TCH */ + return 5; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + /* no DTX here, all blocks must be present! */ + return 3; + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + /* no DTX here, all blocks must be present! */ + return 3; + default: + return 0; + } +} + /* if we clip the TOA value to 12 bits, i.e. toa256=3200, * -> the maximum deviation can be 2*3200 = 6400 * -> the maximum squared deviation can be 6400^2 = 40960000 @@ -482,6 +555,10 @@ /* compute Osmocom extended measurements for the given lchan */ static void lchan_meas_compute_extended(struct gsm_lchan *lchan) { + unsigned int num_ul_meas; + unsigned int num_ul_meas_excess = 0; + unsigned int num_ul_meas_expect; + /* we assume that lchan_meas_check_compute() has already computed the mean value * and we can compute the min/max/variance/stddev from this */ int i; @@ -489,19 +566,47 @@ /* each measurement is an int32_t, so the squared difference value must fit in 32bits */ /* the sum of the squared values (each up to 32bit) can very easily exceed 32 bits */ u_int64_t sq_diff_sum = 0; + + /* In case we do not have any measurement values collected there is no + * computation possible. We just skip the whole computation here, the + * lchan->meas.flags will not get the LC_UL_M_F_OSMO_EXT_VALID flag set + * so no extended measurement results will be reported back via RSL. + * this is ok, since we have nothing to report anyway and apart of that + * we also just lost the signal (otherwise we would have at least some + * measurements). */ + if (!lchan->meas.num_ul_meas) + return; + /* initialize min/max values with their counterpart */ lchan->meas.ext.toa256_min = INT16_MAX; lchan->meas.ext.toa256_max = INT16_MIN; - OSMO_ASSERT(lchan->meas.num_ul_meas); + /* Determine the number of measurement values we need to take into the + * computation. In this case we only compute over the measurements we + * have indeed received. Since this computation is about timing + * information it does not make sense to approach missing measurement + * samples the TOA with 0. This would bend the average towards 0. What + * counts is the average TOA of the properly received blocks so that + * the TA logic can make a proper decision. */ + num_ul_meas_expect = lchan_meas_num_expected(lchan); + if (lchan->meas.num_ul_meas > num_ul_meas_expect) { + num_ul_meas = num_ul_meas_expect; + num_ul_meas_excess = lchan->meas.num_ul_meas - num_ul_meas_expect; + } + else + num_ul_meas = lchan->meas.num_ul_meas; /* all computations are done on the relative arrival time of the burst, relative to the * beginning of its slot. This is of course excluding the TA value that the MS has already * compensated/pre-empted its transmission */ /* step 1: compute the sum of the squared difference of each value to mean */ - for (i = 0; i < lchan->meas.num_ul_meas; i++) { - struct bts_ul_meas *m = &lchan->meas.uplink[i]; + for (i = 0; i < num_ul_meas; i++) { + const struct bts_ul_meas *m; + + OSMO_ASSERT(i < lchan->meas.num_ul_meas); + m = &lchan->meas.uplink[i+num_ul_meas_excess]; + int32_t diff = (int32_t)m->ta_offs_256bits - (int32_t)lchan->meas.ms_toa256; /* diff can now be any value of +65535 to -65535, so we can safely square it, * but only in unsigned math. As squaring looses the sign, we can simply drop @@ -517,7 +622,7 @@ lchan->meas.ext.toa256_min = m->ta_offs_256bits; } /* step 2: compute the variance (mean of sum of squared differences) */ - sq_diff_sum = sq_diff_sum / lchan->meas.num_ul_meas; + sq_diff_sum = sq_diff_sum / num_ul_meas; /* as the individual summed values can each not exceed 2^32, and we're * dividing by the number of summands, the resulting value can also not exceed 2^32 */ OSMO_ASSERT(sq_diff_sum <= UINT32_MAX); @@ -535,54 +640,137 @@ uint32_t irssi_sub_sum = 0; int32_t ta256b_sum = 0; unsigned int num_meas_sub = 0; + unsigned int num_meas_sub_actual = 0; + unsigned int num_meas_sub_subst = 0; + unsigned int num_meas_sub_expect; + unsigned int num_ul_meas; + unsigned int num_ul_meas_actual = 0; + unsigned int num_ul_meas_subst = 0; + unsigned int num_ul_meas_expect; + unsigned int num_ul_meas_excess = 0; int i; /* if measurement period is not complete, abort */ if (!is_meas_complete(lchan, fn)) return 0; - /* if there are no measurements, skip computation */ - if (lchan->meas.num_ul_meas == 0) - return 0; + LOGP(DMEAS, LOGL_DEBUG, "%s Calculating measurement results for physical channel:%s\n", + gsm_lchan_name(lchan), gsm_pchan_name(ts_pchan(lchan->ts))); - /* compute the actual measurements */ + /* Note: Some phys will send no measurement indication at all + * when a block is lost. Also in DTX mode blocks are left out + * intentionally to save energy. It is not necessarly an error + * when we get less measurements as we expect. */ + num_ul_meas_expect = lchan_meas_num_expected(lchan); - /* step 1: add up */ - for (i = 0; i < lchan->meas.num_ul_meas; i++) { - struct bts_ul_meas *m = &lchan->meas.uplink[i]; + if (lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) + num_meas_sub_expect = lchan_meas_sub_num_expected(lchan); + else { + /* FIXME: the amount of SUB Measurements is a dynamic parameter + * in AMR and can not be determined by using a lookup table. + * See also: OS#2978 */ + num_meas_sub_expect = 0; + } + + if (lchan->meas.num_ul_meas > num_ul_meas_expect) + num_ul_meas_excess = lchan->meas.num_ul_meas - num_ul_meas_expect; + num_ul_meas = num_ul_meas_expect; + + LOGP(DMEAS, LOGL_DEBUG, "%s received %u UL measurements, expected %u\n", gsm_lchan_name(lchan), + lchan->meas.num_ul_meas, num_ul_meas_expect); + if (num_ul_meas_excess) + LOGP(DMEAS, LOGL_DEBUG, "%s received %u excess UL measurements\n", gsm_lchan_name(lchan), + num_ul_meas_excess); + + /* Measurement computation step 1: add up */ + for (i = 0; i < num_ul_meas; i++) { + const struct bts_ul_meas *m; + bool is_sub = false; + + /* Note: We will always compute over a full measurement, + * interval even when not enough measurement samples are in + * the buffer. As soon as we run out of measurement values + * we continue the calculation using dummy values. This works + * well for the BER, since there we can safely assume 100% + * since a missing measurement means that the data (block) + * is lost as well (some phys do not give us measurement + * reports for lost blocks or blocks that are spaced out for + * DTX). However, for RSSI and TA this does not work since + * there we would distort the calculation if we would replace + * them with a made up number. This means for those values we + * only compute over the data we have actually received. */ + + if (i < lchan->meas.num_ul_meas) { + m = &lchan->meas.uplink[i + num_ul_meas_excess]; + if (m->is_sub) { + irssi_sub_sum += m->inv_rssi; + num_meas_sub_actual++; + is_sub = true; + } + irssi_full_sum += m->inv_rssi; + ta256b_sum += m->ta_offs_256bits; + + num_ul_meas_actual++; + } else { + m = &measurement_dummy; + if (num_ul_meas_expect - i <= num_meas_sub_expect - num_meas_sub) { + num_meas_sub_subst++; + is_sub = true; + } + + num_ul_meas_subst++; + } ber_full_sum += m->ber10k; - irssi_full_sum += m->inv_rssi; - ta256b_sum += m->ta_offs_256bits; - - if (m->is_sub) { + if (is_sub) { num_meas_sub++; ber_sub_sum += m->ber10k; - irssi_sub_sum += m->inv_rssi; } } - /* step 2: divide */ - ber_full_sum = ber_full_sum / lchan->meas.num_ul_meas; - irssi_full_sum = irssi_full_sum / lchan->meas.num_ul_meas; - ta256b_sum = ta256b_sum / lchan->meas.num_ul_meas; + LOGP(DMEAS, LOGL_DEBUG, "%s received UL measurements contain %u SUB measurements, expected %u\n", + gsm_lchan_name(lchan), num_meas_sub_actual, num_meas_sub_expect); + LOGP(DMEAS, LOGL_DEBUG, "%s replaced %u measurements with dummy values, from which %u were SUB measurements\n", + gsm_lchan_name(lchan), num_ul_meas_subst, num_meas_sub_subst); - if (num_meas_sub) { - ber_sub_sum = ber_sub_sum / num_meas_sub; - irssi_sub_sum = irssi_sub_sum / num_meas_sub; - } else { - LOGP(DMEAS, LOGL_ERROR, "%s No measurements for SUB!!!\n", gsm_lchan_name(lchan)); - /* The only situation in which this can occur is if the related uplink burst/block was - * missing, so let's set BER to 100% and level to lowest possible. */ - ber_sub_sum = 10000; /* 100% */ - irssi_sub_sum = 120; /* -120 dBm */ + if (num_meas_sub != num_meas_sub_expect) { + LOGP(DMEAS, LOGL_ERROR, "%s Incorrect number of SUB measurements detected!\n", gsm_lchan_name(lchan)); + /* Normally the logic above should make sure that there is + * always the exact amount of SUB measurements taken into + * account. If not then the logic that decides tags the received + * measurements as is_sub works incorrectly. Since the logic + * above only adds missing measurements during the calculation + * it can not remove excess SUB measurements or add missing SUB + * measurements when there is no more room in the interval. */ } + /* Measurement computation step 2: divide */ + ber_full_sum = ber_full_sum / num_ul_meas; + + if (!irssi_full_sum) + ber_full_sum = MEASUREMENT_DUMMY_IRSSI; + else + irssi_full_sum = irssi_full_sum / num_ul_meas_actual; + + if (!num_ul_meas_actual) + ta256b_sum = lchan->meas.ms_toa256; + else + ta256b_sum = ta256b_sum / num_ul_meas_actual; + + if (!num_meas_sub) + ber_sub_sum = MEASUREMENT_DUMMY_BER; + else + ber_sub_sum = ber_sub_sum / num_meas_sub; + + if (!num_meas_sub_actual) + irssi_sub_sum = MEASUREMENT_DUMMY_IRSSI; + else + irssi_sub_sum = irssi_sub_sum / num_meas_sub_actual; + LOGP(DMEAS, LOGL_INFO, "%s Computed TA256(% 4d) BER-FULL(%2u.%02u%%), RSSI-FULL(-%3udBm), " - "BER-SUB(%2u.%02u%%), RSSI-SUB(-%3udBm)\n", gsm_lchan_name(lchan), - ta256b_sum, ber_full_sum/100, - ber_full_sum%100, irssi_full_sum, ber_sub_sum/100, ber_sub_sum%100, - irssi_sub_sum); + "BER-SUB(%2u.%02u%%), RSSI-SUB(-%3udBm)\n", gsm_lchan_name(lchan), + ta256b_sum, ber_full_sum / 100, + ber_full_sum % 100, irssi_full_sum, ber_sub_sum / 100, ber_sub_sum % 100, irssi_sub_sum); /* store results */ mru = &lchan->meas.ul_res; @@ -593,20 +781,18 @@ lchan->meas.ms_toa256 = ta256b_sum; LOGP(DMEAS, LOGL_INFO, "%s UL MEAS RXLEV_FULL(%u), RXLEV_SUB(%u)," - "RXQUAL_FULL(%u), RXQUAL_SUB(%u), num_meas_sub(%u), num_ul_meas(%u) \n", - gsm_lchan_name(lchan), - mru->full.rx_lev, - mru->sub.rx_lev, - mru->full.rx_qual, - mru->sub.rx_qual, num_meas_sub, lchan->meas.num_ul_meas); + "RXQUAL_FULL(%u), RXQUAL_SUB(%u), num_meas_sub(%u), num_ul_meas(%u) \n", + gsm_lchan_name(lchan), + mru->full.rx_lev, mru->sub.rx_lev, mru->full.rx_qual, mru->sub.rx_qual, num_meas_sub, num_ul_meas_expect); lchan->meas.flags |= LC_UL_M_F_RES_VALID; lchan_meas_compute_extended(lchan); lchan->meas.num_ul_meas = 0; - /* send a signal indicating computation is complete */ + /* return 1 to indicte that the computation has been done and the next + * interval begins. */ return 1; } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index b90227a..c397ddd 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -24,6 +24,7 @@ #include "sysmobts_fr_samples.h" #include "meas_testcases.h" + void test_fn_sample(struct fn_sample *s, unsigned int len, uint8_t pchan, uint8_t tsmap) { int rc; @@ -73,13 +74,16 @@ static void test_meas_compute(const struct meas_testcase *mtc) { - struct gsm_lchan *lchan = &trx->ts[1].lchan[0]; + struct gsm_lchan *lchan; unsigned int i; unsigned int fn = 0; - printf("\nMeasurement Compute Test %s\n", mtc->name); + printf("\n\n"); + printf("===========================================================\n"); + printf("Measurement Compute Test: %s\n", mtc->name); - lchan->ts->pchan = GSM_PCHAN_TCH_F; + lchan = &trx->ts[mtc->ts].lchan[0]; + lchan->ts->pchan = mtc->pchan; reset_lchan_meas(lchan); /* feed uplink measurements into the code */ @@ -94,6 +98,8 @@ OSMO_ASSERT(!(lchan->meas.flags & LC_UL_M_F_RES_VALID)); } else { OSMO_ASSERT(lchan->meas.flags & (LC_UL_M_F_RES_VALID|LC_UL_M_F_OSMO_EXT_VALID)); + printf("number of measurements: %u\n", mtc->ulm_count); + printf("parameter | actual | expected\n"); printf("meas.ext.toa256_min | %6d | %6d\n", lchan->meas.ext.toa256_min, mtc->res.toa256_min); printf("meas.ext.toa256_max | %6d | %6d\n", @@ -113,6 +119,7 @@ (lchan->meas.ext.toa256_std_dev != mtc->res.toa256_std_dev) || (lchan->meas.ul_res.full.rx_lev != mtc->res.rx_lev_full)) { fprintf(stderr, "%s: Unexpected measurement result!\n", mtc->name); + OSMO_ASSERT(false); } } @@ -1121,6 +1128,15 @@ test_meas_compute(&mtc3); test_meas_compute(&mtc4); test_meas_compute(&mtc5); + test_meas_compute(&mtc_tch_f_complete); + test_meas_compute(&mtc_tch_f_dtx_with_lost_subs); + test_meas_compute(&mtc_tch_f_dtx); + test_meas_compute(&mtc_tch_h_complete); + test_meas_compute(&mtc_tch_h_dtx_with_lost_subs); + test_meas_compute(&mtc_tch_h_dtx); + test_meas_compute(&mtc_overrun); + test_meas_compute(&mtc_sdcch4_complete); + test_meas_compute(&mtc_sdcch8_complete); printf("\n"); printf("***************************************************\n"); diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 58e527a..86d8d87 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -540,33 +540,167 @@ Testing: ts[7]->lchan[0], fn=15170=>015170/11/12/23/14, fn%104=90, rc=1, delta=91 Testing: ts[7]->lchan[1], fn=15183=>015183/11/25/36/27, fn%104=103, rc=1, delta=13 -Measurement Compute Test TOA256 Min-Max negative/positive + +=========================================================== +Measurement Compute Test: TOA256 Min-Max negative/positive +number of measurements: 3 +parameter | actual | expected meas.ext.toa256_min | -256 | -256 meas.ext.toa256_max | 256 | 256 meas.ms_toa256 | 0 | 0 meas.ext.toa256_std_dev | 209 | 209 meas.ul_res.full.rx_lev | 20 | 20 -meas.ul_res.full.rx_qual | 0 | 0 +meas.ul_res.full.rx_qual | 7 | 0 -Measurement Compute Test TOA256 small jitter around 256 + +=========================================================== +Measurement Compute Test: TOA256 small jitter around 256 +number of measurements: 25 +parameter | actual | expected meas.ext.toa256_min | 254 | 254 meas.ext.toa256_max | 258 | 258 meas.ms_toa256 | 256 | 256 meas.ext.toa256_std_dev | 1 | 1 meas.ul_res.full.rx_lev | 20 | 20 -meas.ul_res.full.rx_qual | 0 | 0 +meas.ul_res.full.rx_qual | 0 | 7 -Measurement Compute Test RxLEv averaging + +=========================================================== +Measurement Compute Test: RxLEv averaging +number of measurements: 5 +parameter | actual | expected meas.ext.toa256_min | 0 | 0 meas.ext.toa256_max | 0 | 0 meas.ms_toa256 | 0 | 0 meas.ext.toa256_std_dev | 0 | 0 meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 7 | 0 + + +=========================================================== +Measurement Compute Test: Empty measurements +number of measurements: 0 +parameter | actual | expected +meas.ext.toa256_min | 0 | 0 +meas.ext.toa256_max | 0 | 0 +meas.ms_toa256 | 0 | 0 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 63 | 63 +meas.ul_res.full.rx_qual | 3 | 3 + + +=========================================================== +Measurement Compute Test: TOA256 26 blocks with max TOA256 +number of measurements: 26 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 meas.ul_res.full.rx_qual | 0 | 0 -Measurement Compute Test Empty measurements -Measurement Compute Test TOA256 26 blocks with max TOA256 +=========================================================== +Measurement Compute Test: Complete TCH/F measurement period (26 measurements, 3 sub-frames) +number of measurements: 25 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Incomplete TCH/F measurement period (16 measurements, 1 sub-frame) +number of measurements: 16 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: Incomplete but normal TCH/F measurement period (16 measurements, 3 sub-frames) +number of measurements: 16 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: Complete TCH/H measurement period (26 measurements, 5 sub-frames) +number of measurements: 25 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Incomplete TCH/H measurement period (14 measurements, 3 sub-frames) +number of measurements: 14 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: Incomplete but normal TCH/F measurement period (16 measurements, 5 sub-frames) +number of measurements: 16 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 7 | 7 + + +=========================================================== +Measurement Compute Test: TCH/F measurement period with too much measurement values (overrun) +number of measurements: 59 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Complete SDCCH4 measurement period (3 measurements) +number of measurements: 3 +parameter | actual | expected +meas.ext.toa256_min | 16384 | 16384 +meas.ext.toa256_max | 16384 | 16384 +meas.ms_toa256 | 16384 | 16384 +meas.ext.toa256_std_dev | 0 | 0 +meas.ul_res.full.rx_lev | 20 | 20 +meas.ul_res.full.rx_qual | 0 | 0 + + +=========================================================== +Measurement Compute Test: Complete SDCCH8 measurement period (3 measurements) +number of measurements: 3 +parameter | actual | expected meas.ext.toa256_min | 16384 | 16384 meas.ext.toa256_max | 16384 | 16384 meas.ms_toa256 | 16384 | 16384 diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h index ff74a20..fefa34f 100644 --- a/tests/meas/meas_testcases.h +++ b/tests/meas/meas_testcases.h @@ -1,5 +1,5 @@ -#define ULM(ber, ta, neg_rssi) \ - { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = 0, .inv_rssi = (neg_rssi) } +#define ULM(ber, ta, sub, neg_rssi) \ + { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 1.0, .is_sub = sub, .inv_rssi = (neg_rssi) } struct meas_testcase { const char *name; @@ -7,6 +7,8 @@ const struct bts_ul_meas *ulm; unsigned int ulm_count; uint32_t final_fn; + uint8_t ts; + enum gsm_phys_chan_config pchan; /* results */ struct { int success; @@ -20,15 +22,21 @@ }; static struct bts_ul_meas ulm1[] = { - ULM(0, 0, 90), - ULM(0, 256, 90), - ULM(0, -256, 90), + /* Note: The assumptions about the frame number and the subset + * allegiance is random since for the calculation only the amount + * is of relevance. This is true for all following testcases */ + ULM(0, 0, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, -256, 0, 90), }; + static const struct meas_testcase mtc1 = { .name = "TOA256 Min-Max negative/positive", .ulm = ulm1, .ulm_count = ARRAY_SIZE(ulm1), .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, .res = { .success = 1, .rx_lev_full = 110-90, @@ -41,22 +49,44 @@ }; static struct bts_ul_meas ulm2[] = { - ULM(0, 256, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 258, 90), - ULM(0, 254, 90), - ULM(0, 256, 90), + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 1, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 1, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 256, 1, 90), + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 258, 0, 90), + ULM(0, 254, 0, 90), + ULM(0, 256, 0, 90), + ULM(0, 256, 0, 90), }; + static const struct meas_testcase mtc2 = { .name = "TOA256 small jitter around 256", .ulm = ulm2, .ulm_count = ARRAY_SIZE(ulm2), .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, .res = { .success = 1, .rx_lev_full = 110-90, - .rx_qual_full = 0, + .rx_qual_full = 7, .toa256_mean = 256, .toa256_max = 258, .toa256_min = 254, @@ -65,17 +95,20 @@ }; static struct bts_ul_meas ulm3[] = { - ULM(0, 0, 90), - ULM(0, 0, 80), - ULM(0, 0, 80), - ULM(0, 0, 100), - ULM(0, 0, 100), + ULM(0, 0, 0, 90), + ULM(0, 0, 0, 80), + ULM(0, 0, 0, 80), + ULM(0, 0, 0, 100), + ULM(0, 0, 0, 100), }; + static const struct meas_testcase mtc3 = { .name = "RxLEv averaging", .ulm = ulm3, .ulm_count = ARRAY_SIZE(ulm3), .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, .res = { .success = 1, .rx_lev_full = 110-90, @@ -88,15 +121,18 @@ }; static struct bts_ul_meas ulm4[] = {}; + static const struct meas_testcase mtc4 = { .name = "Empty measurements", .ulm = ulm4, .ulm_count = ARRAY_SIZE(ulm4), .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, .res = { - .success = 0, - .rx_lev_full = 0, - .rx_qual_full = 0, + .success = 1, + .rx_lev_full = 63, + .rx_qual_full = 3, .toa256_mean = 0, .toa256_max = 0, .toa256_min = 0, @@ -107,38 +143,41 @@ static struct bts_ul_meas ulm5[] = { /* one 104 multiframe can at max contain 26 blocks (TCH/F), * each of which can at maximum be 64 bits in advance (TA range) */ - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), - ULM(0, 64*256, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), }; + static const struct meas_testcase mtc5 = { .name = "TOA256 26 blocks with max TOA256", .ulm = ulm5, .ulm_count = ARRAY_SIZE(ulm5), .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, .res = { .success = 1, .rx_lev_full = 110-90, @@ -149,3 +188,391 @@ .toa256_std_dev = 0, }, }; + +/* This testcase models a good case as we can see it when all TCH + * and SACCH blocks are received */ +static struct bts_ul_meas ulm_tch_f_complete[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; + +static const struct meas_testcase mtc_tch_f_complete = { + .name = "Complete TCH/F measurement period (26 measurements, 3 sub-frames)", + .ulm = ulm_tch_f_complete, + .ulm_count = ARRAY_SIZE(ulm_tch_f_complete), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; + +/* This testcase models an error case where two of 3 expected sub measurements + * are lost. The calculation logic must detect this and replace those + * measurements. Note that this example also lacks some blocks due to DTX, + * which is normal. */ +static struct bts_ul_meas ulm_tch_f_dtx_with_lost_subs[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; + +static const struct meas_testcase mtc_tch_f_dtx_with_lost_subs = { + /* This testcase models a good case as we can see it when all TCH + * and SACCH blocks are received */ + .name = "Incomplete TCH/F measurement period (16 measurements, 1 sub-frame)", + .ulm = ulm_tch_f_dtx_with_lost_subs, + .ulm_count = ARRAY_SIZE(ulm_tch_f_dtx_with_lost_subs), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 7, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; + +/* This testcase models a good-case with DTX. Some measurements are missing + * because no block was transmitted, all sub measurements are there. */ +static struct bts_ul_meas ulm_tch_f_dtx[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), +}; + +static const struct meas_testcase mtc_tch_f_dtx = { + .name = "Incomplete but normal TCH/F measurement period (16 measurements, 3 sub-frames)", + .ulm = ulm_tch_f_dtx, + .ulm_count = ARRAY_SIZE(ulm_tch_f_dtx), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 7, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; + +/* This testcase models a good case as we can see it when all TCH + * and SACCH blocks are received */ +static struct bts_ul_meas ulm_tch_h_complete[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; + +static const struct meas_testcase mtc_tch_h_complete = { + .name = "Complete TCH/H measurement period (26 measurements, 5 sub-frames)", + .ulm = ulm_tch_h_complete, + .ulm_count = ARRAY_SIZE(ulm_tch_h_complete), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_H, + .res = { + .success = 1, + .rx_lev_full = 110 - 90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; + +static struct bts_ul_meas ulm_tch_h_dtx_with_lost_subs[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), +}; + +static const struct meas_testcase mtc_tch_h_dtx_with_lost_subs = { + .name = "Incomplete TCH/H measurement period (14 measurements, 3 sub-frames)", + .ulm = ulm_tch_h_dtx_with_lost_subs, + .ulm_count = ARRAY_SIZE(ulm_tch_h_dtx_with_lost_subs), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_H, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 7, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; + +/* This testcase models a good-case with DTX. Some measurements are missing + * because no block was transmitted, all sub measurements are there. */ +static struct bts_ul_meas ulm_tch_h_dtx[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), +}; + +static const struct meas_testcase mtc_tch_h_dtx = { + .name = "Incomplete but normal TCH/F measurement period (16 measurements, 5 sub-frames)", + .ulm = ulm_tch_h_dtx, + .ulm_count = ARRAY_SIZE(ulm_tch_h_dtx), + .final_fn = 38, + .ts = 2, + .pchan = GSM_PCHAN_TCH_H, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 7, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; + +/* This testcase assumes that too many measurements were collected. This can + * happen when the measurement calculation for a previous cycle were not + * executed. In this case the older part of the excess data must be discarded. + * the calculation algorithm must make sure that the calculation only takes + * place on the last measurement interval */ +static struct bts_ul_meas ulm_overrun[] = { + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + /* All measurements above must be discarded */ + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), + ULM(0, 64*256, 0, 90), +}; + +static const struct meas_testcase mtc_overrun = { + .name = "TCH/F measurement period with too much measurement values (overrun)", + .ulm = ulm_overrun, + .ulm_count = ARRAY_SIZE(ulm_overrun), + .final_fn = 25, + .ts = 1, + .pchan = GSM_PCHAN_TCH_F, + .res = { + .success = 1, + .rx_lev_full = 110 - 90, + .rx_qual_full = 0, + .toa256_mean = 64*256, + .toa256_max = 64*256, + .toa256_min = 64*256, + .toa256_std_dev = 0, + }, +}; + +/* Test SDCCH4 with all frames received */ +static struct bts_ul_meas ulm_sdcch4_complete[] = { + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), +}; + +static const struct meas_testcase mtc_sdcch4_complete = { + .name = "Complete SDCCH4 measurement period (3 measurements)", + .ulm = ulm_sdcch4_complete, + .ulm_count = ARRAY_SIZE(ulm_sdcch4_complete), + .final_fn = 88, + .ts = 0, + .pchan = GSM_PCHAN_CCCH_SDCCH4, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 0, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; + +/* Test SDCCH8 with all frames received */ +static struct bts_ul_meas ulm_sdcch8_complete[] = { + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), + ULM(0, 64*256, 1, 90), +}; + +static const struct meas_testcase mtc_sdcch8_complete = { + .name = "Complete SDCCH8 measurement period (3 measurements)", + .ulm = ulm_sdcch8_complete, + .ulm_count = ARRAY_SIZE(ulm_sdcch8_complete), + .final_fn = 66, + .ts = 0, + .pchan = GSM_PCHAN_SDCCH8_SACCH8C, + .res = { + .success = 1, + .rx_lev_full = 20, + .rx_qual_full = 0, + .toa256_mean = 16384, + .toa256_max = 16384, + .toa256_min = 16384, + .toa256_std_dev = 0, + }, +}; -- To view, visit https://gerrit.osmocom.org/10476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idd30fc07603ad7d042c1fb416e247c3bf7d35c8b Gerrit-Change-Number: 10476 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:45:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:45:52 +0000 Subject: Change in osmo-bts[master]: measurement: add SUB measurements in test_lchan_meas_process_measurement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10694 ) Change subject: measurement: add SUB measurements in test_lchan_meas_process_measurement ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I25c361b21a406c0017ee586f0492c38f2e737e57 Gerrit-Change-Number: 10694 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 12:45:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:45:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:45:54 +0000 Subject: Change in osmo-bts[master]: measurement: add SUB measurements in test_lchan_meas_process_measurement In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10694 ) Change subject: measurement: add SUB measurements in test_lchan_meas_process_measurement ...................................................................... measurement: add SUB measurements in test_lchan_meas_process_measurement The unit-test function test_lchan_meas_process_measurement() does not tag measurements as SUB. Lets make the test function more realistic by setting the is_sub flag at the correct positions. - Add SUB-Measurements in the correct position - Print log lines when adding measurements for sub, also fix minor bugs in the log printing. Change-Id: I25c361b21a406c0017ee586f0492c38f2e737e57 Related: OS#3502 Related: OS#2975 --- M tests/meas/meas_test.c M tests/meas/meas_test.ok 2 files changed, 66 insertions(+), 417 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index c397ddd..a33a808 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -895,6 +895,7 @@ unsigned int i; unsigned int k = 0; unsigned int fn = 0; + unsigned int fn104; struct bts_ul_meas ulm; printf("\n\n"); @@ -918,12 +919,21 @@ /* feed uplink measurements into the code */ for (i = 0; i < 100; i++) { - if (dropouts == false || i % 4) + fn104 = fn % 104; + ulm.is_sub = 0; + + if (fn104 >= 52 && fn104 <= 59) { + ulm.is_sub = 1; + } + + if (dropouts == false || i % 4) { + if (ulm.is_sub == 1) + printf("(now adding SUB measurement sample %u)\n", fn); lchan_meas_process_measurement(lchan, &ulm, fn); + } else if (ulm.is_sub == 1) + printf("(leaving out SUB measurement sample for frame number %u)\n", fn); else - printf - ("(leaving out measurement sample for frame number %u)\n", - fn); + printf("(leaving out measurement sample for frame number %u)\n", fn); fn += 4; if (k == 2) { @@ -933,12 +943,11 @@ k++; if (fn % 104 == 39 && no_sacch == false) { - printf - ("(now adding measurement sample for SACCH block)\n"); + printf("(now adding SUB measurement sample for SACCH block at frame number %u)\n", fn); + ulm.is_sub = 1; lchan_meas_process_measurement(lchan, &ulm, fn - 1); - } else - printf - ("(leaving out measurement sample for SACCH block)\n"); + } else if (fn % 104 == 39 && no_sacch == true) + printf("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", fn); } } diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok index 86d8d87..3d4f430 100644 --- a/tests/meas/meas_test.ok +++ b/tests/meas/meas_test.ok @@ -723,341 +723,73 @@ =========================================================== Testing lchan_meas_process_measurement() -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 39) +(now adding SUB measurement sample 52) +(now adding SUB measurement sample 56) +(now adding SUB measurement sample for SACCH block at frame number 143) +(now adding SUB measurement sample 156) +(now adding SUB measurement sample 160) +(now adding SUB measurement sample for SACCH block at frame number 247) +(now adding SUB measurement sample 260) +(now adding SUB measurement sample 264) +(now adding SUB measurement sample for SACCH block at frame number 351) +(now adding SUB measurement sample 364) +(now adding SUB measurement sample 368) =========================================================== Testing lchan_meas_process_measurement() * SACCH blocks not generated. -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 39) +(now adding SUB measurement sample 52) +(now adding SUB measurement sample 56) +(leaving out SUB measurement sample for SACCH block at frame number 143) +(now adding SUB measurement sample 156) +(now adding SUB measurement sample 160) +(leaving out SUB measurement sample for SACCH block at frame number 247) +(now adding SUB measurement sample 260) +(now adding SUB measurement sample 264) +(leaving out SUB measurement sample for SACCH block at frame number 351) +(now adding SUB measurement sample 364) +(now adding SUB measurement sample 368) =========================================================== Testing lchan_meas_process_measurement() * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 17) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 34) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 52) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 39) +(leaving out SUB measurement sample for frame number 52) +(now adding SUB measurement sample 56) (leaving out measurement sample for frame number 69) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 86) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 104) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 121) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 138) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 156) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 143) +(leaving out SUB measurement sample for frame number 156) +(now adding SUB measurement sample 160) (leaving out measurement sample for frame number 173) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 190) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 208) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 225) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 242) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 260) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 247) +(leaving out SUB measurement sample for frame number 260) +(now adding SUB measurement sample 264) (leaving out measurement sample for frame number 277) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 294) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 312) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 329) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 346) -(now adding measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 364) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(now adding SUB measurement sample for SACCH block at frame number 351) +(leaving out SUB measurement sample for frame number 364) +(now adding SUB measurement sample 368) (leaving out measurement sample for frame number 381) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 398) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 416) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) =========================================================== @@ -1065,130 +797,38 @@ * SACCH blocks not generated. * Simulate dropouts by leaving out every 4th measurement (leaving out measurement sample for frame number 0) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 17) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 34) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 52) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 39) +(leaving out SUB measurement sample for frame number 52) +(now adding SUB measurement sample 56) (leaving out measurement sample for frame number 69) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 86) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 104) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 121) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 138) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 156) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 143) +(leaving out SUB measurement sample for frame number 156) +(now adding SUB measurement sample 160) (leaving out measurement sample for frame number 173) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 190) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 208) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 225) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 242) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 260) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 247) +(leaving out SUB measurement sample for frame number 260) +(now adding SUB measurement sample 264) (leaving out measurement sample for frame number 277) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 294) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 312) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 329) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 346) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for frame number 364) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) +(leaving out SUB measurement sample for SACCH block at frame number 351) +(leaving out SUB measurement sample for frame number 364) +(now adding SUB measurement sample 368) (leaving out measurement sample for frame number 381) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 398) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) (leaving out measurement sample for frame number 416) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) -(leaving out measurement sample for SACCH block) =========================================================== -- To view, visit https://gerrit.osmocom.org/10694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I25c361b21a406c0017ee586f0492c38f2e737e57 Gerrit-Change-Number: 10694 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:46:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:46:06 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: drop todo comments In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10700 ) Change subject: cosmetic: lchan activ: drop todo comments ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47e90062c784dd7919fff3115e2bee3314b30cd5 Gerrit-Change-Number: 10700 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 30 Aug 2018 12:46:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:49:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 12:49:19 +0000 Subject: Change in osmo-bsc[master]: lchan: pick proper power and ta values In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10701 ) Change subject: lchan: pick proper power and ta values ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/10701/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10701/1//COMMIT_MSG at 18 PS1, Line 18: For the power,TA levels, take over an old lchan's values only when it is : assigning a new lchan in the same cell. this doesn't make sense, sorry. The process of establishing the new radio channel in asynchronous hand-over with the RACH bursts exists exactly to determine the TA value of the new channel. Copying TA from the old lchan only makes sense if the old lchan is in the same *BTS*. A diferent BTS managed by the same BSC will normally be at a completely different geographical location and you cannot make any assumption on the TA. Hence the async hand-over.... regarding power levels, I would always start with the hghest power level possible/permitted. the power control loop will then ramp down to whatever is sufficient. -- To view, visit https://gerrit.osmocom.org/10701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I360b003398487fa6f934296ff03643c33ec61a35 Gerrit-Change-Number: 10701 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 12:49:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:51:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 12:51:57 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Add quotes to string to fix shellcheck warning In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10703 ) Change subject: osmo-release.sh: Add quotes to string to fix shellcheck warning ...................................................................... osmo-release.sh: Add quotes to string to fix shellcheck warning Change-Id: I40376c99d44552d9b8023fca8d319a9312b0fbb0 --- M osmo-release.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 86b41d8..1e5a203 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -4,7 +4,7 @@ if [ "z$REL" = "z" ]; then echo "No REL value specified, defaulting to 'patch' release" - REL=patch + REL="patch" fi BUMPVER=`command -v bumpversion` -- To view, visit https://gerrit.osmocom.org/10703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I40376c99d44552d9b8023fca8d319a9312b0fbb0 Gerrit-Change-Number: 10703 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:51:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 12:51:58 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Allow forcing release without LIBVERSION bump In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10704 ) Change subject: osmo-release.sh: Allow forcing release without LIBVERSION bump ...................................................................... osmo-release.sh: Allow forcing release without LIBVERSION bump Sometimes a fix release may be required which only contains fixes to parts not related to a shared library, for instance a fix in the build system. Thus allow releasing without bumping LIBVERSION, but only through env var setting for people who know what they are doing. Change-Id: I91e186d47638038bc2968ea0178879365ffc9512 --- M osmo-release.sh 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 1e5a203..26ebd33 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -7,6 +7,8 @@ REL="patch" fi +ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" + BUMPVER=`command -v bumpversion` NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` @@ -27,12 +29,13 @@ echo "Releasing $VERSION -> $NEW_VER..." if [ "z$LIBVERS" != "z" ]; then - if [ "z$MAKEMOD" = "z" ]; then - echo "Before releasing, please modify some of the libversions: $LIBVERS" + if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ]; then + echo "ERROR: Before releasing, please modify some of the libversions: $LIBVERS" echo "You should NOT be doing this unless you've read and understood following article:" echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" exit 1 fi + if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/10704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I91e186d47638038bc2968ea0178879365ffc9512 Gerrit-Change-Number: 10704 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 12:51:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 12:51:59 +0000 Subject: Change in libosmocore[master]: osmo-release.sh: Add checks to help avoid libversion debian major mis... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10705 ) Change subject: osmo-release.sh: Add checks to help avoid libversion debian major mismatch ...................................................................... osmo-release.sh: Add checks to help avoid libversion debian major mismatch Change-Id: Ie0f6a2f9d60908b36f90921bfba3fc31606e5027 --- M osmo-release.sh 1 file changed, 39 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osmo-release.sh b/osmo-release.sh index 26ebd33..4d4d080 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -8,9 +8,19 @@ fi ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" +ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" + +libversion_to_deb_major() { + libversion="$1" + current="$(echo "$libversion" | cut -d ":" -f 1)" + #revision="$(echo "$libversion" | cut -d ":" -f 2)" + age="$(echo "$libversion" | cut -d ":" -f 3)" + major="$(expr "$current" - "$age")" + echo "$major" +} BUMPVER=`command -v bumpversion` - +GIT_TOPDIR="$(git rev-parse --show-toplevel)" NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` @@ -35,7 +45,34 @@ echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" exit 1 fi - + if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then + echo "$LIBVERS" | while read -r line; do + libversion=$(echo "$line" | cut -d "=" -f 2) + major="$(libversion_to_deb_major "$libversion")" + file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)" + if [ "z$file_matches" = "z0" ]; then + echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion" + exit 1 + elif [ "z$file_matches" = "z1" ]; then + echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!" + fi + control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)" + if [ "z$control_matches" = "z0" ]; then + echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion" + exit 1 + elif [ "z$control_matches" = "z1" ]; then + echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion" + else + echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!" + fi + done + # catch and forward exit from pipe subshell "while read": + if [ $? -ne 0 ]; then + exit 1 + fi + fi if [ -f "TODO-RELEASE" ]; then grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/10705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie0f6a2f9d60908b36f90921bfba3fc31606e5027 Gerrit-Change-Number: 10705 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 13:20:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 13:20:15 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: Add systemd service file and install with debian In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10693 ) Change subject: ctrl2cgi: Add systemd service file and install with debian ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 Gerrit-Change-Number: 10693 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 13:20:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 13:20:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 13:20:36 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10697 ) Change subject: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f Gerrit-Change-Number: 10697 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 30 Aug 2018 13:20:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 13:20:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 13:20:39 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10697 ) Change subject: OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion ...................................................................... OsmoSIPConnector: fix: avoid OsmoMGW/OsmoSIPcon confusion Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f --- M OsmoSIPConnector/chapters/configuration.adoc 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc index 0a9a51f..24ac3a5 100644 --- a/OsmoSIPConnector/chapters/configuration.adoc +++ b/OsmoSIPConnector/chapters/configuration.adoc @@ -16,8 +16,8 @@ .Example: MNCC configuration ---- -OsmoMGW(config)# mncc -OsmoMGW(config-mncc)# socket-path /tmp/msc_mncc +OsmoSIPcon(config)# mncc +OsmoSIPcon(config-mncc)# socket-path /tmp/msc_mncc ---- === Configuring SIP @@ -27,9 +27,9 @@ .Example: SIP configuration ---- -OsmoMGW(config)# sip -OsmoMGW(config-sip)# local 10.0.0.1 5060 <1> -OsmoMGW(config-sip)# remote 10.0.0.2 5060 <2> +OsmoSIPcon(config)# sip +OsmoSIPcon(config-sip)# local 10.0.0.1 5060 <1> +OsmoSIPcon(config-sip)# remote 10.0.0.2 5060 <2> ---- <1> The local IP/port to use <2> The remote SIP IP/port that the PBX uses @@ -39,8 +39,8 @@ .Example: Use IMSI instead of MSISDN ---- -OsmoMGW(config)# app -OsmoMGW(config-app)# use-imsi <1> +OsmoSIPcon(config)# app +OsmoSIPcon(config-app)# use-imsi <1> ---- <1> Use the IMSI for MO calling and MT called address -- To view, visit https://gerrit.osmocom.org/10697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If20700d94775e91f174a1a07e00820ef0a91cd2f Gerrit-Change-Number: 10697 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 13:20:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 13:20:58 +0000 Subject: Change in openbsc[master]: debian: Install all service files from contrib/systemd In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10692 ) Change subject: debian: Install all service files from contrib/systemd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic8259aa9f2fe1d9a5631ab102e429347bf39ceb1 Gerrit-Change-Number: 10692 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 13:20:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 13:23:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 13:23:19 +0000 Subject: Change in osmo-bsc[master]: lchan: pick proper power and ta values In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10701 ) Change subject: lchan: pick proper power and ta values ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/10701/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10701/1//COMMIT_MSG at 18 PS1, Line 18: For the power,TA levels, take over an old lchan's values only when it is : assigning a new lchan in the same cell. > this doesn't make sense, sorry. [?] seems like I was unable to read, sorry. -- To view, visit https://gerrit.osmocom.org/10701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I360b003398487fa6f934296ff03643c33ec61a35 Gerrit-Change-Number: 10701 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 13:23:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 13:56:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 13:56:10 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: Add systemd service file and install with debian In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10693 ) Change subject: ctrl2cgi: Add systemd service file and install with debian ...................................................................... ctrl2cgi: Add systemd service file and install with debian Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 --- A contrib/systemd/osmo-ctrl2cgi.service A debian/python3-osmopy-utils.osmo-ctrl2cgi.service M debian/rules 3 files changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/systemd/osmo-ctrl2cgi.service b/contrib/systemd/osmo-ctrl2cgi.service new file mode 100644 index 0000000..36ff78b --- /dev/null +++ b/contrib/systemd/osmo-ctrl2cgi.service @@ -0,0 +1,11 @@ +[Unit] +Description=Proxy between given GCI service and Osmocom CTRL protocol + +[Service] +Type=simple +Restart=always +ExecStart=python3 /usr/bin/ctrl2cgi.py -o -d -c /etc/osmocom/ctrl2cgi.ini +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/python3-osmopy-utils.osmo-ctrl2cgi.service b/debian/python3-osmopy-utils.osmo-ctrl2cgi.service new file mode 120000 index 0000000..9d9498d --- /dev/null +++ b/debian/python3-osmopy-utils.osmo-ctrl2cgi.service @@ -0,0 +1 @@ +../contrib/systemd/osmo-ctrl2cgi.service \ No newline at end of file diff --git a/debian/rules b/debian/rules index d9e98af..b33b599 100755 --- a/debian/rules +++ b/debian/rules @@ -12,3 +12,8 @@ rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy-utils rm -rf $(CURDIR)/debian/python3-osmopy-utils/usr/lib + +override_dh_installinit: + # Install service file with different name than package name: + # https://unix.stackexchange.com/questions/306234/is-it-possible-to-install-two-services-for-one-package-using-dh-installinit-how + dh_installinit --name=osmo-ctrl2cgi -- To view, visit https://gerrit.osmocom.org/10693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I062ae5b9ed09f52b27c7d85b31daba0d14751846 Gerrit-Change-Number: 10693 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 13:56:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 13:56:18 +0000 Subject: Change in openbsc[master]: debian: Install all service files from contrib/systemd In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10692 ) Change subject: debian: Install all service files from contrib/systemd ...................................................................... debian: Install all service files from contrib/systemd Change-Id: Ic8259aa9f2fe1d9a5631ab102e429347bf39ceb1 --- A debian/osmo-bsc-mgcp.service A debian/osmocom-bsc-sccplite.service A debian/osmocom-nitb.service 3 files changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service new file mode 120000 index 0000000..0f8700b --- /dev/null +++ b/debian/osmo-bsc-mgcp.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-bsc-mgcp.service \ No newline at end of file diff --git a/debian/osmocom-bsc-sccplite.service b/debian/osmocom-bsc-sccplite.service new file mode 120000 index 0000000..f30a9db --- /dev/null +++ b/debian/osmocom-bsc-sccplite.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-bsc-sccplite.service \ No newline at end of file diff --git a/debian/osmocom-nitb.service b/debian/osmocom-nitb.service new file mode 120000 index 0000000..eaecd9d --- /dev/null +++ b/debian/osmocom-nitb.service @@ -0,0 +1 @@ +../openbsc/contrib/systemd/osmo-nitb.service \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/10692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic8259aa9f2fe1d9a5631ab102e429347bf39ceb1 Gerrit-Change-Number: 10692 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 14:19:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 30 Aug 2018 14:19:22 +0000 Subject: Change in osmo-mgw[master]: generate shorter 'I:' conn IDs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10676 ) Change subject: generate shorter 'I:' conn IDs ...................................................................... Patch Set 1: Note: *not* CallID, just *Connection ID*. CallID is the one that the MGCP clients send to the MGW to indicate which call reference is served, like an MNCC call reference. The Connection ID in contrast only is the name of one connection on an endpoint, sort of like a fancy array index. Osmo-MGW invents these freely, and the clients only ever echo them back later to reference the particular "half call leg" on an endpoint. For example, osmo-bsc does a CRCX on 1 at mgw. osmo-mgw replies with an OK, including "I: 1234abcd". osmo-bsc remembers ths 1234abcd as the MGCP referene to pass for MDCX or DLCX later. The proper way would be to refactor osmo-mgw to have a maximum connection id length and make it configurable from vty what length is actually dealt out. But in fact, the length of the Conn ID is entirely and solely up to osmo-mgw to determine. If we set one specific conn ID to be generated, they will *always* be that length, because no other entity besides osmo-mgw is allowed to create these IDs. So we cannot modify libosmo-mgcp-client to create shorter IDs, because osmo-mgw creates these IDs. libosmo-mgcp-client should still be able to receive and handle any length of Connection ID it receives from osmo-mgw, we're just making osmo-mgw hand out shorter ones. But true, if a client sends a Connection ID that is too long, we should make sure to mismatch and not truncate that when parsing the incoming message. I think that's the case, but let me verify. Does this patch make more sense now? -- To view, visit https://gerrit.osmocom.org/10676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia290c22a91fca0e5aa44515fca6df00064aff100 Gerrit-Change-Number: 10676 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 30 Aug 2018 14:19:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 14:21:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 30 Aug 2018 14:21:37 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: no need to clear mr again In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10699 ) Change subject: cosmetic: lchan activ: no need to clear mr again ...................................................................... Patch Set 1: This one does not actually make any funcitonal change. It is merely removing two lines of code that have no effect anyway. For me that's a cosmetic change? -- To view, visit https://gerrit.osmocom.org/10699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b38f222f1c8c822e8e5e776850dbc60e30e8b8d Gerrit-Change-Number: 10699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 30 Aug 2018 14:21:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 14:23:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 30 Aug 2018 14:23:12 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: fix log of conn_id presence In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10674 ) Change subject: mgcp_test: fix log of conn_id presence ...................................................................... mgcp_test: fix log of conn_id presence Flip logic to accurately log whether an 'I:' is included, instead of logging the opposite. Note that it isn't possible to log the actual conn ID, because they are random and differ in every test run, which would collide with the fixed expected output file mgcp_test.ok. Change-Id: Idcd731b9daf618b97d8f7e6a776266071cd29e08 --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 27 insertions(+), 27 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index f8f701e..228b2f9 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -737,7 +737,7 @@ if (msg) { rc = get_conn_id_from_response(msg->data, last_conn_id, sizeof(last_conn_id)); - if (rc) + if (rc == 0) printf("(response contains a connection id)\n"); else printf("(response does not contain a connection id)\n"); diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index fcad85a..915d45e 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -22,7 +22,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing AUEP2 @@ -34,7 +34,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing MDCX1 @@ -46,7 +46,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing MDCX2 @@ -58,7 +58,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX @@ -79,7 +79,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -93,7 +93,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -117,7 +117,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -141,7 +141,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -165,7 +165,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -189,7 +189,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -213,7 +213,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) ================================================ Testing MDCX4_RO @@ -228,7 +228,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -243,7 +243,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX_ZYN @@ -256,7 +256,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -277,7 +277,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing SHORT2 @@ -288,7 +288,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing SHORT3 @@ -299,7 +299,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing SHORT4 @@ -310,7 +310,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing RQNT1 @@ -324,7 +324,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing RQNT2 @@ -338,7 +338,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing DLCX @@ -352,7 +352,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX @@ -373,7 +373,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -387,7 +387,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -402,7 +402,7 @@ checking response: using message as statically defined for comparison Response matches our expectations. -(response contains a connection id) +(response does not contain a connection id) ================================================ Testing CRCX @@ -416,7 +416,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ @@ -439,7 +439,7 @@ checking response: using message with patched conn_id for comparison Response matches our expectations. -(response does not contain a connection id) +(response contains a connection id) Dummy packets: 2 ================================================ -- To view, visit https://gerrit.osmocom.org/10674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idcd731b9daf618b97d8f7e6a776266071cd29e08 Gerrit-Change-Number: 10674 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 14:23:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 30 Aug 2018 14:23:13 +0000 Subject: Change in osmo-mgw[master]: mgcp_test: fix get_conn_id_from_response() CI length In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/10675 ) Change subject: mgcp_test: fix get_conn_id_from_response() CI length ...................................................................... mgcp_test: fix get_conn_id_from_response() CI length This function is set on conn ID length of 32 characters. Make it detect a shorter length also when parsing 'o=-' headers. Before, this failed to recognize a space as the end of the conn ID, now sees any non-hex char as end. Related: OS#3507 Change-Id: I762c273bac172acb6d0aae6ea6267603ab654cbf --- M tests/mgcp/mgcp_test.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 228b2f9..2f3a8a7 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -37,6 +37,7 @@ #include #include #include +#include char *strline_r(char *str, char **saveptr); @@ -626,8 +627,10 @@ if (got_conn_id) { for (i = 0; i < conn_id_len; i++) { - if (conn_id[i] == '\n' || conn_id[i] == '\r') + if (!isxdigit(conn_id[i])) { conn_id[i] = '\0'; + break; + } } /* A valid conn_id must at least contain one digit, and must -- To view, visit https://gerrit.osmocom.org/10675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I762c273bac172acb6d0aae6ea6267603ab654cbf Gerrit-Change-Number: 10675 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 14:33:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 30 Aug 2018 14:33:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts_tests: do not define bs_ag_blks_res in multiple locations Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10707 Change subject: bts_tests: do not define bs_ag_blks_res in multiple locations ...................................................................... bts_tests: do not define bs_ag_blks_res in multiple locations The parameter bs_ag_blks_res is currently defined in ts_SI3_default and in each PagingTestCfg record. When the parameter is changed in PagingTestCfg it must be changed in ts_SI3_default as well in order to have coherent settings in the stestsuit and in the BTS. This can be quite confusing so lets use the setting from ts_SI3_default when populating PagingTestCfg to have the value of the constant in one place only. Change-Id: I5cbdb31c8398aa241faca34e850388d5e1682167 Related: OS#1575 --- M bts/BTS_Tests.ttcn 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/10707/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 890be91..fd2e50f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1692,9 +1692,10 @@ * - that CCCH LOAD IND (PCH) are being generated * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_imsi_80percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 0.8, exp_load_ind := true, exp_overload := false, @@ -1715,9 +1716,10 @@ * - that CCCH LOAD IND (PCH) are being generated * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_tmsi_80percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 0.8, exp_load_ind := true, exp_overload := false, @@ -1738,9 +1740,10 @@ * - that CCCH LOAD IND (PCH) are being generated and reach 0 at some point * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_imsi_200percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 2.0, exp_load_ind := true, exp_overload := true, @@ -1763,9 +1766,10 @@ * - that CCCH LOAD IND (PCH) are being generated and reach 0 at some point * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_tmsi_200percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 2.0, exp_load_ind := true, exp_overload := true, -- To view, visit https://gerrit.osmocom.org/10707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5cbdb31c8398aa241faca34e850388d5e1682167 Gerrit-Change-Number: 10707 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 15:09:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 30 Aug 2018 15:09:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: show return code when sending L1CTL_FBSB_REQ fails Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10708 Change subject: show return code when sending L1CTL_FBSB_REQ fails ...................................................................... show return code when sending L1CTL_FBSB_REQ fails Provide a little bit more information when a BTS test fails due to L1CTL FBSB failure. Example output: Test case TC_si_sched_default finished. Verdict: fail reason: \ FBSB Failed with non-zero return code 255 Change-Id: I5e8f23a2615b64bdf3167d486ba808c93f0f4b23 --- M library/L1CTL_PortType.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/10708/1 diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 14a059c..8e03c02 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -35,12 +35,13 @@ function f_L1CTL_FBSB(L1CTL_PT pt, Arfcn arfcn, L1ctlCcchMode ccch_mode := CCCH_MODE_COMBINED, integer rxlev_exp := 57) { timer T := 15.0; for (var integer i := 0; i < 10; i := i+1) { + var L1ctlDlMessage dl; pt.send(ts_L1CTL_FBSB_REQ(arfcn, valueof(t_L1CTL_FBSB_F_ALL), 0, ccch_mode, rxlev_exp)); T.start alt { [] pt.receive(tr_L1CTL_FBSB_CONF(0)) { return; }; - [i >= 9] pt.receive(tr_L1CTL_FBSB_CONF(?)) { - setverdict(fail, "FBSB Failed with non-zero return code"); + [i >= 9] pt.receive(tr_L1CTL_FBSB_CONF(?)) -> value dl { + setverdict(fail, "FBSB Failed with non-zero return code ", dl.payload.fbsb_conf.result); mtc.stop; }; [] pt.receive(tr_L1CTL_FBSB_CONF(?)) { -- To view, visit https://gerrit.osmocom.org/10708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5e8f23a2615b64bdf3167d486ba808c93f0f4b23 Gerrit-Change-Number: 10708 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 15:09:48 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 30 Aug 2018 15:09:48 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10617 ) Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... Patch Set 2: Verified+1 Code-Review+2 Sort-of verified (not the ansible thing and not the debianjessie from) -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Comment-Date: Thu, 30 Aug 2018 15:09:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 15:09:54 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 30 Aug 2018 15:09:54 +0000 Subject: Change in osmo-ci[master]: OsmocomBB: Add lua5.3 for the scriping interface In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10617 ) Change subject: OsmocomBB: Add lua5.3 for the scriping interface ...................................................................... OsmocomBB: Add lua5.3 for the scriping interface Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M docker/Dockerfile.deb8_amd64 M docker/Dockerfile.deb8_i386 M docker/Dockerfile_osmocom_jenkins.amd64 4 files changed, 31 insertions(+), 6 deletions(-) Approvals: Holger Freyther: Looks good to me, approved; Verified Harald Welte: Looks good to me, but someone else must approve diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 2ad1ec8..71bf9f1 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -85,3 +85,22 @@ - libusb-dev - libzmq3-dev - sqlite3 + +- name: install liblua for jessie + apt: + name: liblua5.3-dev + cache_valid_time: 3600 + update_cache: yes + install_recommends: no + default_release: jessie-backports + when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' + +- name: install liblua for stretch + apt: + name: "{{ item }}" + cache_valid_time: 3600 + update_cache: yes + install_recommends: no + with_items: + - liblua5.3-dev + when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64 index f32a3c3..c996396 100644 --- a/docker/Dockerfile.deb8_amd64 +++ b/docker/Dockerfile.deb8_amd64 @@ -1,6 +1,8 @@ FROM debianjessie -RUN dpkg --add-architecture i386 && \ +RUN \ + echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \ + dpkg --add-architecture i386 && \ DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make @@ -26,7 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev libusb-1.0-0-dev libtalloc-dev # OsmocomBB -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports # building RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf stow diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386 index c9b3aa9..9605106 100644 --- a/docker/Dockerfile.deb8_i386 +++ b/docker/Dockerfile.deb8_i386 @@ -1,6 +1,8 @@ FROM 32bit/debian -RUN dpkg --add-architecture i386 && \ +RUN \ + echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \ + dpkg --add-architecture i386 && \ DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make @@ -29,7 +31,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libusb-1.0-0-dev libssl-dev libtalloc-dev # OsmocomBB -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports # for osmo-python-tests RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 12154b3..cc68bf4 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -1,6 +1,8 @@ FROM debian:jessie -RUN dpkg --add-architecture i386 && \ +RUN \ + echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \ + dpkg --add-architecture i386 && \ DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make @@ -26,7 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev libusb-1.0-0-dev libtalloc-dev libgnutls28-dev # OsmocomBB -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports # building RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf -- To view, visit https://gerrit.osmocom.org/10617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia3bd58b98d1e248a92ddd171fb16a23ca8e0b29d Gerrit-Change-Number: 10617 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Aug 30 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 30 Aug 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#231?= In-Reply-To: <1633744920.68.1535555407014.JavaMail.jenkins@jenkins.osmocom.org> References: <1633744920.68.1535555407014.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1211917326.77.1535641806838.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Aug 30 15:13:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 30 Aug 2018 15:13:59 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan activ: no need to clear mr again In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10699 ) Change subject: cosmetic: lchan activ: no need to clear mr again ...................................................................... Patch Set 1: > This one does not actually make any funcitonal change. It is merely > removing two lines of code that have no effect anyway. For me > that's a cosmetic change? They would have no effect if they were enclosed in comment tags or "#if 0", but they are not, so clearly you are changing the implementation and generated instructions. That would for instance require an increment in LIBVERSION revision: "If the library source code has changed at all since the last update, then increment revision (?c:r:a? becomes ?c:r+1:a?)." -- To view, visit https://gerrit.osmocom.org/10699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8b38f222f1c8c822e8e5e776850dbc60e30e8b8d Gerrit-Change-Number: 10699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 30 Aug 2018 15:13:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 15:20:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 30 Aug 2018 15:20:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: show return code when sending L1CTL_FBSB_REQ fails In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10708 ) Change subject: show return code when sending L1CTL_FBSB_REQ fails ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e8f23a2615b64bdf3167d486ba808c93f0f4b23 Gerrit-Change-Number: 10708 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 30 Aug 2018 15:20:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 15:22:09 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Thu, 30 Aug 2018 15:22:09 +0000 Subject: Change in osmo-gsm-tester[master]: Check for smpplib being installed as well In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10681 ) Change subject: Check for smpplib being installed as well ...................................................................... Check for smpplib being installed as well from the docs: pip3 install git+git://github.com/podshumok/python-smpplib.git Change-Id: I6be1c961e512e68d5bed8b317d1dda363a58fbe7 --- M check_dependencies.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/check_dependencies.py b/check_dependencies.py index ff78fe3..83df7a9 100755 --- a/check_dependencies.py +++ b/check_dependencies.py @@ -25,5 +25,6 @@ import pydbus import sqlite3 import sispm +import smpplib print('dependencies ok') -- To view, visit https://gerrit.osmocom.org/10681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6be1c961e512e68d5bed8b317d1dda363a58fbe7 Gerrit-Change-Number: 10681 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 18:12:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 18:12:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: show return code when sending L1CTL_FBSB_REQ fails In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10708 ) Change subject: show return code when sending L1CTL_FBSB_REQ fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e8f23a2615b64bdf3167d486ba808c93f0f4b23 Gerrit-Change-Number: 10708 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 30 Aug 2018 18:12:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 18:13:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 18:13:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: show return code when sending L1CTL_FBSB_REQ fails In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10708 ) Change subject: show return code when sending L1CTL_FBSB_REQ fails ...................................................................... show return code when sending L1CTL_FBSB_REQ fails Provide a little bit more information when a BTS test fails due to L1CTL FBSB failure. Example output: Test case TC_si_sched_default finished. Verdict: fail reason: \ FBSB Failed with non-zero return code 255 Change-Id: I5e8f23a2615b64bdf3167d486ba808c93f0f4b23 --- M library/L1CTL_PortType.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 14a059c..8e03c02 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -35,12 +35,13 @@ function f_L1CTL_FBSB(L1CTL_PT pt, Arfcn arfcn, L1ctlCcchMode ccch_mode := CCCH_MODE_COMBINED, integer rxlev_exp := 57) { timer T := 15.0; for (var integer i := 0; i < 10; i := i+1) { + var L1ctlDlMessage dl; pt.send(ts_L1CTL_FBSB_REQ(arfcn, valueof(t_L1CTL_FBSB_F_ALL), 0, ccch_mode, rxlev_exp)); T.start alt { [] pt.receive(tr_L1CTL_FBSB_CONF(0)) { return; }; - [i >= 9] pt.receive(tr_L1CTL_FBSB_CONF(?)) { - setverdict(fail, "FBSB Failed with non-zero return code"); + [i >= 9] pt.receive(tr_L1CTL_FBSB_CONF(?)) -> value dl { + setverdict(fail, "FBSB Failed with non-zero return code ", dl.payload.fbsb_conf.result); mtc.stop; }; [] pt.receive(tr_L1CTL_FBSB_CONF(?)) { -- To view, visit https://gerrit.osmocom.org/10708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5e8f23a2615b64bdf3167d486ba808c93f0f4b23 Gerrit-Change-Number: 10708 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 18:15:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 18:15:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts_tests: do not define bs_ag_blks_res in multiple locations In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10707 ) Change subject: bts_tests: do not define bs_ag_blks_res in multiple locations ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cbdb31c8398aa241faca34e850388d5e1682167 Gerrit-Change-Number: 10707 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 30 Aug 2018 18:15:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 18:15:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 18:15:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts_tests: do not define bs_ag_blks_res in multiple locations In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10707 ) Change subject: bts_tests: do not define bs_ag_blks_res in multiple locations ...................................................................... bts_tests: do not define bs_ag_blks_res in multiple locations The parameter bs_ag_blks_res is currently defined in ts_SI3_default and in each PagingTestCfg record. When the parameter is changed in PagingTestCfg it must be changed in ts_SI3_default as well in order to have coherent settings in the stestsuit and in the BTS. This can be quite confusing so lets use the setting from ts_SI3_default when populating PagingTestCfg to have the value of the constant in one place only. Change-Id: I5cbdb31c8398aa241faca34e850388d5e1682167 Related: OS#1575 --- M bts/BTS_Tests.ttcn 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 890be91..fd2e50f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1692,9 +1692,10 @@ * - that CCCH LOAD IND (PCH) are being generated * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_imsi_80percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 0.8, exp_load_ind := true, exp_overload := false, @@ -1715,9 +1716,10 @@ * - that CCCH LOAD IND (PCH) are being generated * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_tmsi_80percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 0.8, exp_load_ind := true, exp_overload := false, @@ -1738,9 +1740,10 @@ * - that CCCH LOAD IND (PCH) are being generated and reach 0 at some point * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_imsi_200percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 2.0, exp_load_ind := true, exp_overload := true, @@ -1763,9 +1766,10 @@ * - that CCCH LOAD IND (PCH) are being generated and reach 0 at some point * - that CCCH LOAD IND (PCH) [no load] is received after paging flood is over */ testcase TC_paging_tmsi_200percent() runs on test_CT { + var SystemInformation si3 := valueof(ts_SI3_default); var PagingTestCfg cfg := { combined_ccch := true, - bs_ag_blks_res := 1, + bs_ag_blks_res := si3.payload.si3.ctrl_chan_desc.bs_ag_blks_res, load_factor := 2.0, exp_load_ind := true, exp_overload := true, -- To view, visit https://gerrit.osmocom.org/10707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5cbdb31c8398aa241faca34e850388d5e1682167 Gerrit-Change-Number: 10707 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 18:58:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 30 Aug 2018 18:58:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add ttcn3 test suites slides from OsmoDevCon 2018 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/10709 Change subject: add ttcn3 test suites slides from OsmoDevCon 2018 ...................................................................... add ttcn3 test suites slides from OsmoDevCon 2018 Those slides are copied from http://git.gnumonks.org/laforge-slides/plain/2018/osmodevcon2018-ttcn3_test_suites/ to make sure they are more easily found. It would be nice to convert them into an actual asciidoc book with one chapter per test suite which would be built from within this repository. This way we can keep documentation and code better in sync. Change-Id: I8a0d66babc165678ec53a1ee1c673e93708b8b79 --- A doc/osmodevcon2018-ttcn3_test_suites.adoc 1 file changed, 296 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/10709/1 diff --git a/doc/osmodevcon2018-ttcn3_test_suites.adoc b/doc/osmodevcon2018-ttcn3_test_suites.adoc new file mode 100644 index 0000000..3273314 --- /dev/null +++ b/doc/osmodevcon2018-ttcn3_test_suites.adoc @@ -0,0 +1,296 @@ +Osmocom TTCN-3 Test Suites +========================== +:author: Harald Welte +:copyright: 2018 by Harald Welte (License: CC-BY-SA) +:backend: slidy +:max-width: 45em + + +== Osmocom TTCN-3 Test Suites + +* developed in 2017+2018 +* compiled using Eclipse TITAN +** uses just a command-line compiler + Makefiles +** no IDE needed at all, don't let _Eclipse_ fool you +* containerized in Docker +* executed by Jenkins CI + +== Terminology + +ATS:: Abstract Test Suite +MTC:: Main Test Component +PTC:: Parallel Test Component +IUT:: Implementation Under Test + +== Test Suite Philosophy + +* test one network element (our IUT) +* test external behavior (3GPP and non-3GPP) +* emulate entire environment from TTCN-3 +* don't reuse Osmocom C-code protocol implementations in the tests +* test against independent TTCN-3 implementations! + +== What to test? + +* successful cases +* erroneous cases (no answer, NACK, ...) +** many difficult to reproduce with real phones/devices +* load / resource exhaustion +* spec compliance +* focus on functionality actually relevant to IUT + +== Why TTCN-3 + TITAN + +* TTCN-3 specifically designed for telecom protocol testing +* TITAN team released many telecom protocols in TTCN-3, such as +** BSSAP, L3 (RR/MM/CC), SMS (CP/RP/TP), SS, M3UA, SCCP, GTP, NS, BSSGP, ... +** shortens our test development cycle +** permits us to test against known working industry implementations + +== Test suites for Osmocom CNI components + +* `osmo-bts` +* `osmo-bsc` +* `osmo-msc` +* `osmo-mgw` +* `osmo-hlr` +* `osmo-sip-connector` +* `osmo-sgsn` +* `osmo-ggsn` + +== Test suites in progress + +* `osmo-pcu` +* `osmo-bsc_nat` + + + + +== BTS_Tests.ttcn + +* external interfaces +** A-bis side: RSL (emulates BSC-side server) +** Um side: L1CTL to control MS +** PCU side: pcu_socket + +[graphviz] +---- +digraph G { + rankdir=LR; + { rank=same; BTS, BSC}; + BTS [label="IUT\nosmo-bts-trx",shape="box"]; + ATS [label="ATS\nBTS_Tests.ttcn"]; + BSC [label="osmo-bsc\nOML only"]; + BTS -> fake_trx [label="bursts"]; + fake_trx -> trxcon [label="bursts"]; + trxcon -> ATS [label="bursts"]; + + BTS -> BSC [label="A-bis OML"]; + BTS -> ATS [label="A-bis RSL"]; + + ATS -> BTS [label="pcu_sock"]; + ATS -> BSC [label="VTY"]; + ATS -> BTS [label="CTRL"]; +} +---- + + + +== BSC_Tests.ttcn + +* external interfaces +** A-bis side: RSL (emulates BTS-side client) +** A-side: BSSAP/SCCP/M3UA (emulates MSC-side) +** MGW side: MGCP (emulates MGW side) + +[graphviz] +---- +digraph G { + rankdir=LR; + { rank=same; BTS; STP; }; + BSC [label="IUT\nosmo-bsc",shape="box"]; + ATS [label="ATS\nBSC_Tests.ttcn"]; + BTS [label="osmo-bts-omldummy\nOML only"]; + + BTS -> BSC [label="A-bis OML"]; + ATS -> BSC [label="A-bis RSL"]; + ATS -> BSC [label="CTRL"]; + ATS -> BSC [label="VTY"]; + ATS -> STP [label="A BSSAP\nSCCP/M3UA"]; + BSC -> STP [label="A BSSAP\nSCCP/M3UA"]; +} +---- + +== MSC_Tests.ttcn + +* external interfaces +** A: BSSAP/SCCP/M3UA (emulates BSC-side) +** MNCC: MNCC/unix-domain (emulates ext. MNCC side) +** MGW: MGCP (emulates MGW side) +** GSUP (impllements HLR side) + +[graphviz] +---- +digraph G { + rankdir=LR; + MSC [label="IUT\nosmo-msc",shape="box"]; + ATS [label="ATS\nMSC_Tests.ttcn"]; + + ATS -> MSC [label="MNCC"]; + ATS -> MSC [label="SMPP",style="dashed"]; + ATS -> MSC [label="CTRL"]; + ATS -> MSC [label="VTY"]; + MSC -> ATS [label="GSUP"]; + ATS -> STP [label="A BSSAP\nSCCP/M3UA"]; + MSC -> STP [label="A BSSAP\nSCCP/M3UA"]; +} +---- + + +== MGCP_Test.ttcn + +* external interfaces +** MGCP (emulates call agent) +** RTP (stream source/sink) + +[graphviz] +---- +digraph G { + rankdir=LR; + MGW [label="IUT\nosmo-mgw",shape="box"]; + ATS [label="ATS\nMGCP_Test.ttcn"]; + + ATS -> MGW [label="RTP"]; + ATS -> MGW [label="MGCP"]; + MGW -> ATS [label="RTP"]; +} +---- + +== HLR_Tests.ttcn + +* external interfaces +** GSUP (emulates VLR/SGSN side) +** VTY + +[graphviz] +---- +digraph G { + rankdir=LR; + HLR [label="IUT\nosmo-hlr",shape="box"]; + ATS [label="ATS\nHLR_Tests.ttcn"]; + + ATS -> HLR [label="GSUP"]; + ATS -> HLR [label="VTY"]; +} +---- + + +== SIP_Tests.ttcn + +* external interfaces +** MNCC (emulates MSC side) +** SIP (emulates SIP switch) +** VTY + +[graphviz] +---- +digraph G { + rankdir=LR; + SIP [label="SIP\nosmo-sip-connector",shape="box"]; + ATS [label="ATS\nSIP_Tests.ttcn"]; + + ATS -> SIP [label="MNCC"]; + ATS -> SIP [label="SIP"]; + ATS -> SIP [label="VTY"]; +} +---- + + +== SGSN_Tests.ttcn + +* external interfaces +** Gb (emulates PCU side NS/BSSGP + MS) +** GSUP (emulates HLR) +** VTY + +[graphviz] +---- +digraph G { + rankdir=LR; + SGSN [label="SGSN\nosmo-sgsn",shape="box"]; + ATS [label="ATS\nSGSN_Tests.ttcn"]; + + ATS -> SGSN [label="Gb"]; + SGSN-> ATS [label="Gp (GTP)"]; + ATS -> SGSN [label="VTY"]; +} +---- + + +== GGSN_Tests.ttcn + +* external interfaces +** Gp: GTP (emulates SGSN) +** Gi: IP (emulates Internet) + +[graphviz] +---- +digraph G { + rankdir=LR; + GGSN [label="GGSN\nosmo-ggsn",shape="box"]; + ATS [label="ATS\nGGSN_Tests.ttcn"]; + + ATS -> GGSN [label="Gp (GTP)"]; + GGSN -> ATS [label="Gi (IP)"]; + ATS -> GGSN [label="VTY"]; +} +---- + + + +== Dockerized Setup + +* one process per container +* packages either +** IUT (e.g. `osmo-bsc`) +** ATS (compiled docker test suite) +** other utility (e.g. `trxcon` or `osmo-bts-omldummy`) +* why? +** no need for local ip/network configuration +** standardized / packaged setup on every machine +** run older/newer versions of ATS against older/newer IUT + +== Jenkins CI Execution + +. update `docker-playground.git` +.. contains `Dockerfile` for ATS + IUT +. rebuild IUT container[s] (e.g. `osmo-bts-master`) +.. git magic ensures re-build only if `osmo-bts.git` master changed +. rebuild ATS container (e.g. `ttcn3-bts-test`) +.. git magic ensures re-build only if `osmo-ttcn3-hacks.git` master changed +. run `docker-playground/ttcn3-bts-test/jenkins.sh` +.. creates docker network +.. starts IUT + ATS docker containers +.. collects test results + + +== Jenkins CI Reporting + +* junit-xml generation +* store artefacts +** pcap file of every test case +** ATS log file (TTCN-3 testsuite) +** IUT log file[s] (`osmo-*.log`) +** IUT config file[s] (`osmo-*.cfg`) +* see https://jenkins.osmocom.org/jenkins/view/TTCN3/ + + +== Further Reading + +* http://git.osmocom.org/osmo-ttcn3-hacks/ +* http://git.osmocom.org/docker-playground/ +* http://osmocom.org/projects/cellular-infrastructure/wiki/Titan_TTCN3_Notes + +== EOF + +End of File -- To view, visit https://gerrit.osmocom.org/10709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8a0d66babc165678ec53a1ee1c673e93708b8b79 Gerrit-Change-Number: 10709 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Aug 30 19:07:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 30 Aug 2018 19:07:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: add ttcn3 test suites slides from OsmoDevCon 2018 In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10709 ) Change subject: add ttcn3 test suites slides from OsmoDevCon 2018 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10709/1/doc/osmodevcon2018-ttcn3_test_suites.adoc File doc/osmodevcon2018-ttcn3_test_suites.adoc: https://gerrit.osmocom.org/#/c/10709/1/doc/osmodevcon2018-ttcn3_test_suites.adoc at 130 PS1, Line 130: impllements typo: implements suggestion: s/implements/emulates/? -- To view, visit https://gerrit.osmocom.org/10709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a0d66babc165678ec53a1ee1c673e93708b8b79 Gerrit-Change-Number: 10709 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 30 Aug 2018 19:07:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 08:03:17 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 31 Aug 2018 08:03:17 +0000 Subject: Change in osmo-gsm-tester[master]: Generate imsi/ki on OsmoMobile construction In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10682 ) Change subject: Generate imsi/ki on OsmoMobile construction ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10682/1/src/osmo_ms_driver/starter.py File src/osmo_ms_driver/starter.py: https://gerrit.osmocom.org/#/c/10682/1/src/osmo_ms_driver/starter.py at 74 PS1, Line 74: self._imsi, self._ki = next(self._imsi_ki_generator) > This imsi_ki_generator stuff can be integrated into osmo-gsm-tester in a similar way to how we alloc [?] Agreed. I will look into how to make use of it and how it fits into the config. -- To view, visit https://gerrit.osmocom.org/10682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b Gerrit-Change-Number: 10682 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 31 Aug 2018 08:03:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 08:03:20 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 31 Aug 2018 08:03:20 +0000 Subject: Change in osmo-gsm-tester[master]: Generate imsi/ki on OsmoMobile construction In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10682 ) Change subject: Generate imsi/ki on OsmoMobile construction ...................................................................... Generate imsi/ki on OsmoMobile construction Take an IMSI/KI when creating the OsmoMobile and not when starting it. This will allow other code to know which IMSIs will be used before the system starts (e.g. to add it to the HLR/nitb db). Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b --- M src/osmo_ms_driver/starter.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 243dedc..bab468c 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -71,6 +71,7 @@ self._imsi_ki_generator = imsi_ki_generator self._phy_filename = phy_filename self._ev_server_path = ev_server_path + self._imsi, self._ki = next(self._imsi_ki_generator) def write_lua_cfg(self): lua_support = os.path.join(os.path.dirname(__file__), 'lua') @@ -87,13 +88,12 @@ return lua_cfg_file def write_mob_cfg(self, lua_filename, phy_filename): - (imsi, ki) = next(self._imsi_ki_generator) cfg = { 'test': { 'script': lua_filename, 'virt_phy': phy_filename, - 'imsi': imsi, - 'ki_comp128': ki, + 'imsi': self._imsi, + 'ki_comp128': self._ki, 'ms_number': self._name_number, } } -- To view, visit https://gerrit.osmocom.org/10682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I79e259e948aa797c13118143ecd64bb7e29d274b Gerrit-Change-Number: 10682 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:47 +0000 Subject: Change in osmo-trx[master]: configure.ac: Add --enable-werror option Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10716 Change subject: configure.ac: Add --enable-werror option ...................................................................... configure.ac: Add --enable-werror option Change-Id: Ib2782aecd400398bf36427f255c2a427ef781e06 --- M configure.ac 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/16/10716/1 diff --git a/configure.ac b/configure.ac index cc099d2..e1cc121 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,25 @@ LDFLAGS="$LDFLAGS -fsanitize=address -fsanitize=undefined" fi +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + + AC_ARG_WITH(uhd, [ AS_HELP_STRING([--with-uhd], [enable UHD based transceiver]) -- To view, visit https://gerrit.osmocom.org/10716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2782aecd400398bf36427f255c2a427ef781e06 Gerrit-Change-Number: 10716 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:48 +0000 Subject: Change in osmo-trx[master]: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10717 Change subject: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp ...................................................................... UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp Fixes compilation warning: In file included from osmo-trx/Transceiver52M/device/uhd/UHDDevice.cpp:31: /usr/include/uhd/utils/thread_priority.hpp:10:17: note: #pragma message: This header is deprecated - please use instead. Change-Id: I6299df48a5e14c54eaa07288d166c705eb9ebdbe --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/17/10717/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 63d3dec..a9ae19a 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #ifdef HAVE_CONFIG_H #include "config.h" -- To view, visit https://gerrit.osmocom.org/10717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6299df48a5e14c54eaa07288d166c705eb9ebdbe Gerrit-Change-Number: 10717 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:48 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Use available copyTo Vector API instead of memcopy Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10718 Change subject: SigProcLib: Use available copyTo Vector API instead of memcopy ...................................................................... SigProcLib: Use available copyTo Vector API instead of memcopy This change allows to remove some wrong use of code as per compilation warning: osmo-trx/Transceiver52M/sigProcLib.cpp:1266:40: error: ?void* memcpy(void*, const void*, size_t)? writing to an object of non-trivially copyable type ?class Complex?; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] midMidamble->size() * sizeof(complex)); Change-Id: Id446711349bec70fa4e7c8efe0f7f9faf7e4f277 --- M CommonLibs/Vector.h M Transceiver52M/sigProcLib.cpp 2 files changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/10718/1 diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h index 15d6710..0ba1b9e 100644 --- a/CommonLibs/Vector.h +++ b/CommonLibs/Vector.h @@ -107,7 +107,7 @@ void clone(const Vector& other) { resize(other.size()); - memcpy(mData,other.mStart,other.bytes()); + other.copyTo(*this); } diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index e94170b..2040b36 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1262,8 +1262,7 @@ data = (complex *) convolve_h_alloc(midMidamble->size()); _midMidamble = new signalVector(data, 0, midMidamble->size()); _midMidamble->setAligned(true); - memcpy(_midMidamble->begin(), midMidamble->begin(), - midMidamble->size() * sizeof(complex)); + midMidamble->copyTo(*_midMidamble); autocorr = convolve(midamble, _midMidamble, NULL, NO_DELAY); if (!autocorr) { @@ -1319,8 +1318,7 @@ data = (complex *) convolve_h_alloc(midamble->size()); _midamble = new signalVector(data, 0, midamble->size()); _midamble->setAligned(true); - memcpy(_midamble->begin(), midamble->begin(), - midamble->size() * sizeof(complex)); + midamble->copyTo(*_midamble); /* Channel gain is an empirically measured value */ seq = new CorrelationSequence; @@ -1360,7 +1358,7 @@ data = (complex *) convolve_h_alloc(seq1->size()); _seq1 = new signalVector(data, 0, seq1->size()); _seq1->setAligned(true); - memcpy(_seq1->begin(), seq1->begin(), seq1->size() * sizeof(complex)); + seq1->copyTo(*_seq1); autocorr = convolve(seq0, _seq1, autocorr, NO_DELAY); if (!autocorr) { @@ -1457,7 +1455,7 @@ { signalVector in(DOWNSAMPLE_IN_LEN, dnsampler->len()); signalVector *out = new signalVector(DOWNSAMPLE_OUT_LEN); - memcpy(in.begin(), burst.begin(), DOWNSAMPLE_IN_LEN * 2 * sizeof(float)); + burst.copyToSegment(in, 0, DOWNSAMPLE_IN_LEN); if (dnsampler->rotate((float *) in.begin(), DOWNSAMPLE_IN_LEN, (float *) out->begin(), DOWNSAMPLE_OUT_LEN) < 0) { -- To view, visit https://gerrit.osmocom.org/10718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id446711349bec70fa4e7c8efe0f7f9faf7e4f277 Gerrit-Change-Number: 10718 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:49 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace in several files Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10719 Change subject: cosmetic: Fix trailing whitespace in several files ...................................................................... cosmetic: Fix trailing whitespace in several files Change-Id: Ibf5a69f0a3a309e87814635fd903b114fe68890c --- M CommonLibs/Vector.h M Transceiver52M/radioInterfaceMulti.cpp M Transceiver52M/sigProcLib.cpp 3 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/19/10719/1 diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h index 0ba1b9e..51a9fb1 100644 --- a/CommonLibs/Vector.h +++ b/CommonLibs/Vector.h @@ -282,7 +282,7 @@ T* end() { return mEnd; } bool isOwner() { return !!mData; } // Do we own any memory ourselves? //@} - + }; diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index 650fd85..b3add21 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -1,7 +1,7 @@ /* * Multi-carrier radio interface * - * Copyright (C) 2016 Ettus Research LLC + * Copyright (C) 2016 Ettus Research LLC * * Author: Tom Tsou * diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 2040b36..692fbe0 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1102,17 +1102,17 @@ if (start < 0) start = 0; int end = (int) (floor(ix) + 11); if ((unsigned) end > inSig.size()-1) end = inSig.size()-1; - + complex pVal = 0.0; if (!inSig.isReal()) { - for (int i = start; i < end; i++) + for (int i = start; i < end; i++) pVal += inSig[i] * sinc(M_PI_F*(i-ix)); } else { - for (int i = start; i < end; i++) + for (int i = start; i < end; i++) pVal += inSig[i].real() * sinc(M_PI_F*(i-ix)); } - + return pVal; } @@ -1157,12 +1157,12 @@ // to save computation, we'll use early-late balancing float earlyIndex = maxIndex-1; float lateIndex = maxIndex+1; - + float incr = 0.5; while (incr > 1.0/1024.0) { complex earlyP = interpolatePoint(rxBurst,earlyIndex); complex lateP = interpolatePoint(rxBurst,lateIndex); - if (earlyP < lateP) + if (earlyP < lateP) earlyIndex += incr; else if (earlyP > lateP) earlyIndex -= incr; @@ -1250,7 +1250,7 @@ // NOTE: Because ideal TSC 16-bit midamble is 66 symbols into burst, // the ideal TSC has an + 180 degree phase shift, - // due to the pi/2 frequency shift, that + // due to the pi/2 frequency shift, that // needs to be accounted for. // 26-midamble is 61 symbols into burst, has +90 degree phase shift. scaleVector(*midMidamble, complex(-1.0, 0.0)); @@ -1589,7 +1589,7 @@ } -/* +/* * RACH burst detection * * Correlation window parameters: @@ -1614,7 +1614,7 @@ return rc; } -/* +/* * Normal burst detection * * Correlation window parameters: -- To view, visit https://gerrit.osmocom.org/10719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf5a69f0a3a309e87814635fd903b114fe68890c Gerrit-Change-Number: 10719 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:49 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti:pullBuffer: Sanely convert float array to complex... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10720 Change subject: radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array ...................................................................... radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array Fixes this type of compilation warning: ?void* memcpy(void*, const void*, size_t)? writing to an object of non-trivially copyable type ?class Complex?; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] Change-Id: Ibb2380a0a335ce798fe87221519fbbebade53054 --- M Transceiver52M/radioInterfaceMulti.cpp 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/20/10720/1 diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp index b3add21..0823419 100644 --- a/Transceiver52M/radioInterfaceMulti.cpp +++ b/Transceiver52M/radioInterfaceMulti.cpp @@ -230,6 +230,7 @@ bool local_underrun; size_t num; float *buf; + unsigned int i; if (recvBuffer[0]->getFreeSegments() <= 0) return; @@ -273,10 +274,22 @@ buf = channelizer->outputBuffer(pchan); size_t cLen = channelizer->outputLen(); size_t hLen = dnsampler->len(); - size_t hSize = 2 * hLen * sizeof(float); - memcpy(&buf[2 * -hLen], history[lchan]->begin(), hSize); - memcpy(history[lchan]->begin(), &buf[2 * (cLen - hLen)], hSize); + float *fdst = &buf[2 * -hLen]; + complex *src = history[lchan]->begin(); + for (i = 0; i < hLen; i++) { + fdst[0] = src->real(); + fdst[1] = src->imag(); + src++; + fdst += 2; + } + complex *dst = history[lchan]->begin(); + float *fsrc = &buf[2 * (cLen - hLen)]; + for (i = 0; i < hLen; i++) { + *dst = complex(fdst[0], fdst[1]); + fsrc += 2; + dst++; + } float *wr_segment = recvBuffer[lchan]->getWriteSegment(); -- To view, visit https://gerrit.osmocom.org/10720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb2380a0a335ce798fe87221519fbbebade53054 Gerrit-Change-Number: 10720 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:49 +0000 Subject: Change in osmo-trx[master]: Vector: Copy arrays in a sane wayfor non-trivially copyable types Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10721 Change subject: Vector: Copy arrays in a sane wayfor non-trivially copyable types ...................................................................... Vector: Copy arrays in a sane wayfor non-trivially copyable types Avoids this type of compilation warnings: ?void* memcpy(void*, const void*, size_t)? writing to an object of non-trivially copyable type ?class Complex?; use copy-assignment or copy-initialization instead [-Werror=class-memaccess] Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c --- M CommonLibs/Vector.h M Transceiver52M/signalVector.cpp 2 files changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/21/10721/1 diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h index 51a9fb1..a53d8d9 100644 --- a/CommonLibs/Vector.h +++ b/CommonLibs/Vector.h @@ -204,10 +204,15 @@ */ void copyToSegment(Vector& other, size_t start, size_t span) const { - T* base = other.mStart + start; - assert(base+span<=other.mEnd); + unsigned int i; + T* dst = other.mStart + start; + T* src = mStart; + assert(dst+span<=other.mEnd); assert(mStart+span<=mEnd); - memcpy(base,mStart,span*sizeof(T)); + for(i = 0; i < span; i++, src++, dst++) + *dst = *src; + /*TODO if not non-trivially copyable type class, optimize: + memcpy(dst,mStart,span*sizeof(T)); */ } /** Copy all of this Vector to a segment of another Vector. */ diff --git a/Transceiver52M/signalVector.cpp b/Transceiver52M/signalVector.cpp index 55dad92..c6dd0f2 100644 --- a/Transceiver52M/signalVector.cpp +++ b/Transceiver52M/signalVector.cpp @@ -41,7 +41,14 @@ void signalVector::operator=(const signalVector& vector) { resize(vector.size() + vector.getStart()); - memcpy(mData, vector.mData, bytes()); + + unsigned int i; + complex *dst = mData; + complex *src = vector.mData; + for(i = 0; i < size(); i++, src++, dst++) + *dst = *src; + /* TODO: optimize for non non-trivially copyable types: */ + /*memcpy(mData, vector.mData, bytes()); */ mStart = mData + vector.getStart(); } @@ -58,8 +65,13 @@ size_t signalVector::updateHistory() { size_t num = getStart(); - - memmove(mData, mStart + this->size() - num, num * sizeof(complex)); + unsigned int i; + complex *dst = mData; + complex *src = mStart + this->size() - num; + for(i = 0; i < num; i++, src++, dst++) + *dst = *src; + /* TODO: optimize for non non-trivially copyable types: */ + /*memmove(mData, mStart + this->size() - num, num * sizeof(complex)); */ return num; } -- To view, visit https://gerrit.osmocom.org/10721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c Gerrit-Change-Number: 10721 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:50 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: Add --enable-werror flag to osmo-trx configure step Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10722 Change subject: jenkins.sh: Add --enable-werror flag to osmo-trx configure step ...................................................................... jenkins.sh: Add --enable-werror flag to osmo-trx configure step This way we catch newly introduced compilation warnings in osmo-trx. Change-Id: I7effaf243fd6e7fe69728cfce5f97e0b5bd4743c --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/22/10722/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 59f68f7..44a49c3 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -79,7 +79,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --with-uhd --with-usrp1 $INSTR +./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 $INSTR $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/10722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7effaf243fd6e7fe69728cfce5f97e0b5bd4743c Gerrit-Change-Number: 10722 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:51:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:51:50 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: Enable build of osmo-trx-lms Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10723 Change subject: jenkins.sh: Enable build of osmo-trx-lms ...................................................................... jenkins.sh: Enable build of osmo-trx-lms Change-Id: Idfa7ce566ad69b181bcadeee7ff023c77ecd4d6b --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/10723/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 44a49c3..029f0e1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -79,7 +79,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 $INSTR +./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/10723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idfa7ce566ad69b181bcadeee7ff023c77ecd4d6b Gerrit-Change-Number: 10723 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:54:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 09:54:41 +0000 Subject: Change in osmo-trx[master]: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10717 ) Change subject: UHHDDevice: Replace deprecated header uhd/utils/thread_priority.hpp ...................................................................... Patch Set 1: Didn't test this batch of patches yes, wrote them during my flight. -- To view, visit https://gerrit.osmocom.org/10717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6299df48a5e14c54eaa07288d166c705eb9ebdbe Gerrit-Change-Number: 10717 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 31 Aug 2018 09:54:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 09:57:58 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 09:57:58 +0000 Subject: Change in osmo-sip-connector[master]: wip In-Reply-To: References: Message-ID: Keith Whyte has abandoned this change. ( https://gerrit.osmocom.org/10702 ) Change subject: wip ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/10702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4e68bda2e7dc6842de1bbe2849097537ad84e8f6 Gerrit-Change-Number: 10702 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 10:09:37 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 31 Aug 2018 10:09:37 +0000 Subject: Change in osmo-bts[master]: paging: add unit to check different bs_ag_blks_res settings Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10724 Change subject: paging: add unit to check different bs_ag_blks_res settings ...................................................................... paging: add unit to check different bs_ag_blks_res settings The parameter bs_ag_blks_res, which is loaded into the BTS via the SI3 setting, defines how many of the CCCH blocks shall be used for AGCH. The remaining CCCH blocks will then be available as PCH for paging. Unfortunately there is no unit-test yet that verifies that all of the 8 different settings for bs_ag_blks_res. - Separate the the decision logic that checks if a given fn is part of an AGCH into a function to have it available in the unit-test. - Add a test that checks all possible bs_ag_blks_res settings. Change-Id: Ib9652f4013a4da3766852f8f03ce9ec5590f6989 Related: OS#1575 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M tests/paging/paging_test.c M tests/paging/paging_test.ok 4 files changed, 91 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/10724/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index ad13145..4568b7e 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -93,4 +93,7 @@ int bts_check_for_first_ciphrd(struct gsm_lchan *lchan, uint8_t *data, int len); + +int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn); + #endif /* L1SAP_H */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b8cec0e..55b4a4b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -666,6 +666,15 @@ return 0; } +/* Check if given CCCH frame number is for a PCH or for an AGCH (this function is + * only used internally, it is public to call it from unit-tests) */ +int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn) { + /* Note: The number of available access grant channels is set by the + * parameter BS_AG_BLKS_RES via system information type 3. This SI is + * transfered to osmo-bts via RSL */ + return L1SAP_FN2CCCHBLOCK(fn) < num_agch(trx, "PH-RTS-IND"); +} + /* PH-RTS-IND prim received from bts model */ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *rts_ind) @@ -681,6 +690,7 @@ struct osmo_phsap_prim pp; bool dtxd_facch = false; int rc; + int is_ag_res; chan_nr = rts_ind->chan_nr; link_id = rts_ind->link_id; @@ -783,9 +793,8 @@ } } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); - rc = bts_ccch_copy_msg(trx->bts, p, &g_time, - (L1SAP_FN2CCCHBLOCK(fn) < - num_agch(trx, "PH-RTS-IND"))); + is_ag_res = is_ccch_for_agch(trx, fn); + rc = bts_ccch_copy_msg(trx->bts, p, &g_time, is_ag_res); if (rc <= 0) memcpy(p, fill_frame, GSM_MACBLOCK_LEN); } diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index 0accd0f..1fc7d92 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -110,6 +111,59 @@ ASSERT_TRUE(paging_queue_length(bts->paging_state) == 0); } +/* Set up a dummy trx with a valid setting for bs_ag_blks_res in SI3 */ +static struct gsm_bts_trx *test_is_ccch_for_agch_setup(uint8_t bs_ag_blks_res) +{ + static struct gsm_bts_trx trx; + static struct gsm_bts bts; + struct gsm48_system_information_type_3 si3; + si3.control_channel_desc.bs_ag_blks_res = bs_ag_blks_res; + trx.bts = &bts; + bts.si_valid |= 0x8; + memcpy(&bts.si_buf[SYSINFO_TYPE_3][0], &si3, sizeof(si3)); + return &trx; +} + +/* Walk through all possible settings for bs_ag_blks_res for two + * multiframe 51. The patterns shown in 3GPP TS 05.02 Clause 7 + * Table 5 of 9 must occur. */ +static void test_is_ccch_for_agch(void) +{ + int is_ag_res; + int fn; + uint8_t bs_ag_blks_res; + struct gsm_bts_trx *trx; + + printf("Fn: AGCH: (bs_ag_blks_res=[0:7]\n"); + for (fn = 0; fn < 102; fn++) { + + /* Note: the formula that computes the CCCH block number for a + * given frame number is optimized to work on block boarders, + * for frame numbers that do not fall at the beginning of the + * related block this formula would produce wrong results, so + * we only check with frame numbers that mark the beginning + * of a new block. See also L1SAP_FN2CCCHBLOCK() in l1sap.h */ + + if (fn % 10 != 2 && fn % 10 != 6) + continue; + + printf("%03u: ", fn); + + if (fn % 50 == 2) { + printf(" . . . . . . . . (BCCH)\n"); + continue; + } + + /* Try allo possible settings for bs_ag_blks_res */ + for (bs_ag_blks_res = 0; bs_ag_blks_res <= 7; bs_ag_blks_res++) { + trx = test_is_ccch_for_agch_setup(bs_ag_blks_res); + is_ag_res = is_ccch_for_agch(trx, fn); + printf(" %u", is_ag_res); + } + printf("\n"); + } +} + int main(int argc, char **argv) { tall_bts_ctx = talloc_named_const(NULL, 1, "OsmoBTS context"); @@ -125,6 +179,7 @@ test_paging_smoke(); test_paging_sleep(); + test_is_ccch_for_agch(); printf("Success\n"); return 0; diff --git a/tests/paging/paging_test.ok b/tests/paging/paging_test.ok index 57565e2..50006ec 100644 --- a/tests/paging/paging_test.ok +++ b/tests/paging/paging_test.ok @@ -1,3 +1,24 @@ Testing that paging messages expire. Testing that paging messages expire with sleep. +Fn: AGCH: (bs_ag_blks_res=[0:7] +002: . . . . . . . . (BCCH) +006: 0 1 1 1 1 1 1 1 +012: 0 0 1 1 1 1 1 1 +016: 0 0 0 1 1 1 1 1 +022: 0 0 0 0 1 1 1 1 +026: 0 0 0 0 0 1 1 1 +032: 0 0 0 0 0 0 1 1 +036: 0 0 0 0 0 0 0 1 +042: 0 0 0 0 0 0 0 0 +046: 0 0 0 0 0 0 0 0 +052: . . . . . . . . (BCCH) +056: 0 1 1 1 1 1 1 1 +062: 0 0 1 1 1 1 1 1 +066: 0 0 0 1 1 1 1 1 +072: 0 0 0 0 1 1 1 1 +076: 0 0 0 0 0 1 1 1 +082: 0 0 0 0 0 0 1 1 +086: 0 0 0 0 0 0 0 1 +092: 0 0 0 0 0 0 0 0 +096: 0 0 0 0 0 0 0 0 Success -- To view, visit https://gerrit.osmocom.org/10724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9652f4013a4da3766852f8f03ce9ec5590f6989 Gerrit-Change-Number: 10724 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 10:12:07 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 31 Aug 2018 10:12:07 +0000 Subject: Change in osmo-bts[master]: paging: add unit-test to check different bs_ag_blks_res settings In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/10724 ) Change subject: paging: add unit-test to check different bs_ag_blks_res settings ...................................................................... paging: add unit-test to check different bs_ag_blks_res settings The parameter bs_ag_blks_res, which is loaded into the BTS via the SI3 setting, defines how many of the CCCH blocks shall be used for AGCH. The remaining CCCH blocks will then be available as PCH for paging. Unfortunately there is no unit-test yet that verifies that all of the 8 different settings for bs_ag_blks_res. - Separate the the decision logic that checks if a given fn is part of an AGCH into a function to have it available in the unit-test. - Add a test that checks all possible bs_ag_blks_res settings. Change-Id: Ib9652f4013a4da3766852f8f03ce9ec5590f6989 Related: OS#1575 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M tests/paging/paging_test.c M tests/paging/paging_test.ok 4 files changed, 91 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/10724/2 -- To view, visit https://gerrit.osmocom.org/10724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib9652f4013a4da3766852f8f03ce9ec5590f6989 Gerrit-Change-Number: 10724 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 10:23:37 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 31 Aug 2018 10:23:37 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10683 ) Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10683/1/src/osmo_ms_driver/starter.py File src/osmo_ms_driver/starter.py: https://gerrit.osmocom.org/#/c/10683/1/src/osmo_ms_driver/starter.py at 79 PS1, Line 79: def ki(self): > fyi, The osmo-gsm-tester Modem class also requires a set_ki() API, so that tests can play with passi [?] Good point. But I think we need set_ki on the object returned from the .subscribers(). Maybe it is good to seaprate modem (on/off, CC, MM) from identity? -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 31 Aug 2018 10:23:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 10:26:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 10:26:29 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10683 ) Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Patch Set 2: That may be useful, I remember I actually liked how you splitted it into a Subscriber class. Modem can then hold a Subscriber, and we can pass Subscriber objects to HLR to register them. -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 31 Aug 2018 10:26:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:14:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 31 Aug 2018 12:14:08 +0000 Subject: Change in osmo-trx[master]: configure.ac: Add --enable-werror option In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10716 ) Change subject: configure.ac: Add --enable-werror option ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2782aecd400398bf36427f255c2a427ef781e06 Gerrit-Change-Number: 10716 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 31 Aug 2018 12:14:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:41:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:41:16 +0000 Subject: Change in osmo-trx[master]: configure.ac: Add --enable-werror option In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10716 ) Change subject: configure.ac: Add --enable-werror option ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2782aecd400398bf36427f255c2a427ef781e06 Gerrit-Change-Number: 10716 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 31 Aug 2018 12:41:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:41:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:41:45 +0000 Subject: Change in osmo-trx[master]: SigProcLib: Use available copyTo Vector API instead of memcopy In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10718 ) Change subject: SigProcLib: Use available copyTo Vector API instead of memcopy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id446711349bec70fa4e7c8efe0f7f9faf7e4f277 Gerrit-Change-Number: 10718 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 12:41:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:41:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:41:57 +0000 Subject: Change in osmo-trx[master]: cosmetic: Fix trailing whitespace in several files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10719 ) Change subject: cosmetic: Fix trailing whitespace in several files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5a69f0a3a309e87814635fd903b114fe68890c Gerrit-Change-Number: 10719 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 12:41:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:42:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:42:42 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti:pullBuffer: Sanely convert float array to complex... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10720 ) Change subject: radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array ...................................................................... Patch Set 1: Code-Review+1 I presume this has been tested with some actual SDR hardware? -- To view, visit https://gerrit.osmocom.org/10720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibb2380a0a335ce798fe87221519fbbebade53054 Gerrit-Change-Number: 10720 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 12:42:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:43:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:43:02 +0000 Subject: Change in osmo-trx[master]: Vector: Copy arrays in a sane wayfor non-trivially copyable types In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10721 ) Change subject: Vector: Copy arrays in a sane wayfor non-trivially copyable types ...................................................................... Patch Set 1: Code-Review+1 I presume this has been tested with some SDR hardware? -- To view, visit https://gerrit.osmocom.org/10721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c Gerrit-Change-Number: 10721 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 12:43:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:43:10 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: Add --enable-werror flag to osmo-trx configure step In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10722 ) Change subject: jenkins.sh: Add --enable-werror flag to osmo-trx configure step ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7effaf243fd6e7fe69728cfce5f97e0b5bd4743c Gerrit-Change-Number: 10722 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 12:43:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:43:19 +0000 Subject: Change in osmo-trx[master]: jenkins.sh: Enable build of osmo-trx-lms In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10723 ) Change subject: jenkins.sh: Enable build of osmo-trx-lms ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfa7ce566ad69b181bcadeee7ff023c77ecd4d6b Gerrit-Change-Number: 10723 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 12:43:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:44:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:44:30 +0000 Subject: Change in osmo-bts[master]: paging: add unit-test to check different bs_ag_blks_res settings In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10724 ) Change subject: paging: add unit-test to check different bs_ag_blks_res settings ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib9652f4013a4da3766852f8f03ce9ec5590f6989 Gerrit-Change-Number: 10724 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 12:44:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 12:44:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 12:44:31 +0000 Subject: Change in osmo-bts[master]: paging: add unit-test to check different bs_ag_blks_res settings In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10724 ) Change subject: paging: add unit-test to check different bs_ag_blks_res settings ...................................................................... paging: add unit-test to check different bs_ag_blks_res settings The parameter bs_ag_blks_res, which is loaded into the BTS via the SI3 setting, defines how many of the CCCH blocks shall be used for AGCH. The remaining CCCH blocks will then be available as PCH for paging. Unfortunately there is no unit-test yet that verifies that all of the 8 different settings for bs_ag_blks_res. - Separate the the decision logic that checks if a given fn is part of an AGCH into a function to have it available in the unit-test. - Add a test that checks all possible bs_ag_blks_res settings. Change-Id: Ib9652f4013a4da3766852f8f03ce9ec5590f6989 Related: OS#1575 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M tests/paging/paging_test.c M tests/paging/paging_test.ok 4 files changed, 91 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index ad13145..4568b7e 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -93,4 +93,7 @@ int bts_check_for_first_ciphrd(struct gsm_lchan *lchan, uint8_t *data, int len); + +int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn); + #endif /* L1SAP_H */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b8cec0e..55b4a4b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -666,6 +666,15 @@ return 0; } +/* Check if given CCCH frame number is for a PCH or for an AGCH (this function is + * only used internally, it is public to call it from unit-tests) */ +int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn) { + /* Note: The number of available access grant channels is set by the + * parameter BS_AG_BLKS_RES via system information type 3. This SI is + * transfered to osmo-bts via RSL */ + return L1SAP_FN2CCCHBLOCK(fn) < num_agch(trx, "PH-RTS-IND"); +} + /* PH-RTS-IND prim received from bts model */ static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *rts_ind) @@ -681,6 +690,7 @@ struct osmo_phsap_prim pp; bool dtxd_facch = false; int rc; + int is_ag_res; chan_nr = rts_ind->chan_nr; link_id = rts_ind->link_id; @@ -783,9 +793,8 @@ } } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); - rc = bts_ccch_copy_msg(trx->bts, p, &g_time, - (L1SAP_FN2CCCHBLOCK(fn) < - num_agch(trx, "PH-RTS-IND"))); + is_ag_res = is_ccch_for_agch(trx, fn); + rc = bts_ccch_copy_msg(trx->bts, p, &g_time, is_ag_res); if (rc <= 0) memcpy(p, fill_frame, GSM_MACBLOCK_LEN); } diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index 0accd0f..1fc7d92 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -110,6 +111,59 @@ ASSERT_TRUE(paging_queue_length(bts->paging_state) == 0); } +/* Set up a dummy trx with a valid setting for bs_ag_blks_res in SI3 */ +static struct gsm_bts_trx *test_is_ccch_for_agch_setup(uint8_t bs_ag_blks_res) +{ + static struct gsm_bts_trx trx; + static struct gsm_bts bts; + struct gsm48_system_information_type_3 si3; + si3.control_channel_desc.bs_ag_blks_res = bs_ag_blks_res; + trx.bts = &bts; + bts.si_valid |= 0x8; + memcpy(&bts.si_buf[SYSINFO_TYPE_3][0], &si3, sizeof(si3)); + return &trx; +} + +/* Walk through all possible settings for bs_ag_blks_res for two + * multiframe 51. The patterns shown in 3GPP TS 05.02 Clause 7 + * Table 5 of 9 must occur. */ +static void test_is_ccch_for_agch(void) +{ + int is_ag_res; + int fn; + uint8_t bs_ag_blks_res; + struct gsm_bts_trx *trx; + + printf("Fn: AGCH: (bs_ag_blks_res=[0:7]\n"); + for (fn = 0; fn < 102; fn++) { + + /* Note: the formula that computes the CCCH block number for a + * given frame number is optimized to work on block boarders, + * for frame numbers that do not fall at the beginning of the + * related block this formula would produce wrong results, so + * we only check with frame numbers that mark the beginning + * of a new block. See also L1SAP_FN2CCCHBLOCK() in l1sap.h */ + + if (fn % 10 != 2 && fn % 10 != 6) + continue; + + printf("%03u: ", fn); + + if (fn % 50 == 2) { + printf(" . . . . . . . . (BCCH)\n"); + continue; + } + + /* Try allo possible settings for bs_ag_blks_res */ + for (bs_ag_blks_res = 0; bs_ag_blks_res <= 7; bs_ag_blks_res++) { + trx = test_is_ccch_for_agch_setup(bs_ag_blks_res); + is_ag_res = is_ccch_for_agch(trx, fn); + printf(" %u", is_ag_res); + } + printf("\n"); + } +} + int main(int argc, char **argv) { tall_bts_ctx = talloc_named_const(NULL, 1, "OsmoBTS context"); @@ -125,6 +179,7 @@ test_paging_smoke(); test_paging_sleep(); + test_is_ccch_for_agch(); printf("Success\n"); return 0; diff --git a/tests/paging/paging_test.ok b/tests/paging/paging_test.ok index 57565e2..50006ec 100644 --- a/tests/paging/paging_test.ok +++ b/tests/paging/paging_test.ok @@ -1,3 +1,24 @@ Testing that paging messages expire. Testing that paging messages expire with sleep. +Fn: AGCH: (bs_ag_blks_res=[0:7] +002: . . . . . . . . (BCCH) +006: 0 1 1 1 1 1 1 1 +012: 0 0 1 1 1 1 1 1 +016: 0 0 0 1 1 1 1 1 +022: 0 0 0 0 1 1 1 1 +026: 0 0 0 0 0 1 1 1 +032: 0 0 0 0 0 0 1 1 +036: 0 0 0 0 0 0 0 1 +042: 0 0 0 0 0 0 0 0 +046: 0 0 0 0 0 0 0 0 +052: . . . . . . . . (BCCH) +056: 0 1 1 1 1 1 1 1 +062: 0 0 1 1 1 1 1 1 +066: 0 0 0 1 1 1 1 1 +072: 0 0 0 0 1 1 1 1 +076: 0 0 0 0 0 1 1 1 +082: 0 0 0 0 0 0 1 1 +086: 0 0 0 0 0 0 0 1 +092: 0 0 0 0 0 0 0 0 +096: 0 0 0 0 0 0 0 0 Success -- To view, visit https://gerrit.osmocom.org/10724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib9652f4013a4da3766852f8f03ce9ec5590f6989 Gerrit-Change-Number: 10724 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 13:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 31 Aug 2018 13:08:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: improve connection failure message in IPA emulation Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/10725 Change subject: improve connection failure message in IPA emulation ...................................................................... improve connection failure message in IPA emulation Show addresses and ports which were attempted in the IPA connection failure message. Example output: Verdict: fail reason: Could not connect IPA socket from "" port -1 \ to "127.0.0.1" port 4238; check your configuration Change-Id: I828fe67d66bcd668aa14922b89a2feac56dc2d9a --- M library/IPA_Emulation.ttcnpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/10725/1 diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 5c385e6..7a26a6b 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -208,7 +208,8 @@ res := IPA_CodecPort_CtrlFunct.f_IPL4_connect(IPA_PORT, remote_host, remote_port, local_host, local_port, 0, { tcp:={} }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect IPA socket, check your configuration"); + setverdict(fail, "Could not connect IPA socket from ", local_host, " port ", local_port, + " to ", remote_host, " port ", remote_port, "; check your configuration"); mtc.stop; } g_ipa_conn_id := res.connId; -- To view, visit https://gerrit.osmocom.org/10725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I828fe67d66bcd668aa14922b89a2feac56dc2d9a Gerrit-Change-Number: 10725 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 13:22:44 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 31 Aug 2018 13:22:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: check paging channel fn _ag_blks_res) Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10726 Change subject: BTS_Tests: check paging channel fn _ag_blks_res) ...................................................................... BTS_Tests: check paging channel fn _ag_blks_res) BTS_Tests.ttcn contains numorous tests that issue pagings via RSL and observe if these pagings are visible on the UM interface as well. However, it is not checked whether the frame number of the blocks on which those pagings are sent actually falls into the range that is specified for PCH. We should check this as well. (The PCH is part of the CCCH, which also contains the AGC. How many blocks of the CCCH are to be used by the PCH is set by the parameter bs_ag_blks_res.) - Check the FN of each paging message that arrives on L1CTL and make sure that those FN are part of the PCH. Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2 Related: OS#1575 --- M bts/BTS_Tests.ttcn 1 file changed, 59 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/10726/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fd2e50f..dfc7efa 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1532,7 +1532,60 @@ } } -altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, inout integer num_paging_rcv_ids) +type record allowedFn { integer frame_nr } +template allowedFn bs_ag_blks_res_0 := { frame_nr := (6, 12, 16, 22, 26, 32, 36, 42, 46) } +template allowedFn bs_ag_blks_res_1 := { frame_nr := (12, 16, 22, 26, 32, 36, 42, 46) } +template allowedFn bs_ag_blks_res_2 := { frame_nr := (16, 22, 26, 32, 36, 42, 46) } +template allowedFn bs_ag_blks_res_3 := { frame_nr := (22, 26, 32, 36, 42, 46) } +template allowedFn bs_ag_blks_res_4 := { frame_nr := (26, 32, 36, 42, 46) } +template allowedFn bs_ag_blks_res_5 := { frame_nr := (32, 36, 42, 46) } +template allowedFn bs_ag_blks_res_6 := { frame_nr := (36, 42, 46) } +template allowedFn bs_ag_blks_res_7 := { frame_nr := (42, 46) } +function check_pch_fn(integer frame_nr, integer bs_ag_blks_res) runs on test_CT +{ + var integer frame_nr_51; + frame_nr_51 := frame_nr mod 51 + + var allowedFn fn_check; + fn_check.frame_nr := frame_nr_51; + + if (bs_ag_blks_res < 0 or bs_ag_blks_res > 7) { + setverdict(fail, "bs_ag_blks_res out of valid range (0..7)"); + mtc.stop; + return; + } + + if (bs_ag_blks_res == 0 and match(fn_check, bs_ag_blks_res_0)) { + return; + } + if (bs_ag_blks_res == 1 and match(fn_check, bs_ag_blks_res_1)) { + return; + } + if (bs_ag_blks_res == 2 and match(fn_check, bs_ag_blks_res_2)) { + return; + } + if (bs_ag_blks_res == 3 and match(fn_check, bs_ag_blks_res_3)) { + return; + } + if (bs_ag_blks_res == 4 and match(fn_check, bs_ag_blks_res_4)) { + return; + } + if (bs_ag_blks_res == 5 and match(fn_check, bs_ag_blks_res_5)) { + return; + } + if (bs_ag_blks_res == 6 and match(fn_check, bs_ag_blks_res_6)) { + return; + } + if (bs_ag_blks_res == 7 and match(fn_check, bs_ag_blks_res_7)) { + return; + } + + setverdict(fail, "received paging on AGCH"); + mtc.stop; + return; +} + +altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, inout integer num_paging_rcv_ids, PagingTestCfg cfg) runs on test_CT { var L1ctlDlMessage dl; [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?, c_DummyUI)) { @@ -1542,6 +1595,9 @@ var octetstring without_plen := substr(dl.payload.data_ind.payload, 1, lengthof(dl.payload.data_ind.payload)-1); var PDU_ML3_NW_MS rr := dec_PDU_ML3_NW_MS(without_plen); + + check_pch_fn(dl.dl_info.frame_nr, cfg.bs_ag_blks_res); + if (match(rr, tr_PAGING_REQ1)) { num_paging_rcv_msgs := num_paging_rcv_msgs + 1; num_paging_rcv_ids := num_paging_rcv_ids + 1; @@ -1659,7 +1715,7 @@ repeat; } /* check if paging requests arrive on Um side */ - [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids); + [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids, cfg); [] L1CTL.receive { repeat; } [] T_itv.timeout { } [] as_rsl_res_ind(); @@ -1670,7 +1726,7 @@ timer T_wait := 18.0; T_wait.start; alt { - [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids); + [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids, cfg); [] L1CTL.receive { repeat; } /* 65535 == empty paging queue, we can terminate*/ [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(65535))) { } -- To view, visit https://gerrit.osmocom.org/10726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2 Gerrit-Change-Number: 10726 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 13:23:24 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 31 Aug 2018 13:23:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: check paging channel fn (bs_ag_blks_res) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10726 to look at the new patch set (#2). Change subject: BTS_Tests: check paging channel fn (bs_ag_blks_res) ...................................................................... BTS_Tests: check paging channel fn (bs_ag_blks_res) BTS_Tests.ttcn contains numorous tests that issue pagings via RSL and observe if these pagings are visible on the UM interface as well. However, it is not checked whether the frame number of the blocks on which those pagings are sent actually falls into the range that is specified for PCH. We should check this as well. (The PCH is part of the CCCH, which also contains the AGC. How many blocks of the CCCH are to be used by the PCH is set by the parameter bs_ag_blks_res.) - Check the FN of each paging message that arrives on L1CTL and make sure that those FN are part of the PCH. Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2 Related: OS#1575 --- M bts/BTS_Tests.ttcn 1 file changed, 59 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/10726/2 -- To view, visit https://gerrit.osmocom.org/10726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2 Gerrit-Change-Number: 10726 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:04:02 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:04:02 +0000 Subject: Change in osmo-sip-connector[master]: Add SIP <-> MNCC Cause Map Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10727 Change subject: Add SIP <-> MNCC Cause Map ...................................................................... Add SIP <-> MNCC Cause Map Implements a cause_map, mapping the SIP status codes to GSM48_CC_CAUSE_* that are defined in libosmocore. The map at the same time implements the Q.850 cause texts that are subsequently used in the SIP Reason: header. Implements two functions cause2status() and status2cause() to read the map and return the the mapped status. The mapping mostly follows the implemention in the LCR program, so that any implementation relying on that mapping should continue to work as expected with osmo-sip-connector. Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 --- M src/sip.c 1 file changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/27/10727/1 diff --git a/src/sip.c b/src/sip.c index 84d1f6e..7e456d9 100644 --- a/src/sip.c +++ b/src/sip.c @@ -148,6 +148,75 @@ talloc_strdup(leg, to)); } +/* Sofia SIP definitions come with error code numbers and strings, this + * map allows us to reuse the existing definitions. + * The map is in priority order. The first matching entry found + * will be used. + */ + +static struct cause_map { + int sip_status; + const char *sip_phrase; + int gsm48_cause; + const char *q850_reason; +} cause_map[] = { + { SIP_200_OK, GSM48_CC_CAUSE_NORM_CALL_CLEAR, "Normal Call Clearing" }, + { SIP_403_FORBIDDEN, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_401_UNAUTHORIZED, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_402_PAYMENT_REQUIRED, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_407_PROXY_AUTH_REQUIRED, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_603_DECLINE, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_406_NOT_ACCEPTABLE, GSM48_CC_CAUSE_CHAN_UNACCEPT, "Channel Unacceptable" }, + { SIP_404_NOT_FOUND, GSM48_CC_CAUSE_UNASSIGNED_NR, "Unallocated Number" }, + { SIP_485_AMBIGUOUS, GSM48_CC_CAUSE_NO_ROUTE, "No Route to Destination" }, + { SIP_604_DOES_NOT_EXIST_ANYWHERE, GSM48_CC_CAUSE_NO_ROUTE, "No Route to Destination" }, + { SIP_504_GATEWAY_TIME_OUT, GSM48_CC_CAUSE_RECOVERY_TIMER, "Recovery on Timer Expiry" }, + { SIP_408_REQUEST_TIMEOUT, GSM48_CC_CAUSE_RECOVERY_TIMER, "Recovery on Timer Expiry" }, + { SIP_410_GONE, GSM48_CC_CAUSE_NUMBER_CHANGED, "Number Changed" }, + { SIP_416_UNSUPPORTED_URI, GSM48_CC_CAUSE_INVAL_TRANS_ID, "Invalid Call Reference Value" }, + { SIP_420_BAD_EXTENSION, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_414_REQUEST_URI_TOO_LONG, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_413_REQUEST_TOO_LARGE, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_421_EXTENSION_REQUIRED, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_423_INTERVAL_TOO_BRIEF, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_505_VERSION_NOT_SUPPORTED, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_513_MESSAGE_TOO_LARGE, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_480_TEMPORARILY_UNAVAILABLE, GSM48_CC_CAUSE_USER_NOTRESPOND, "No User Responding" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_RESOURCE_UNAVAIL,"Resource Unavailable, Unspecified" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_SWITCH_CONG, "Switching Equipment Congestion" }, + { SIP_400_BAD_REQUEST, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_481_NO_CALL, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_500_INTERNAL_SERVER_ERROR, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_486_BUSY_HERE, GSM48_CC_CAUSE_USER_BUSY, "User Busy" }, + { SIP_600_BUSY_EVERYWHERE, GSM48_CC_CAUSE_USER_BUSY, "User Busy" }, + { SIP_484_ADDRESS_INCOMPLETE, GSM48_CC_CAUSE_INV_NR_FORMAT, "Invalid Number Format (addr incomplete)" }, + { SIP_488_NOT_ACCEPTABLE, GSM48_CC_CAUSE_INCOMPAT_DEST, "Incompatible Destination" }, + { SIP_606_NOT_ACCEPTABLE, GSM48_CC_CAUSE_INCOMPAT_DEST, "Incompatible Destination" }, + { SIP_502_BAD_GATEWAY, GSM48_CC_CAUSE_DEST_OOO, "Destination Out of Order" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_NETWORK_OOO, "Network Out of Order" }, + { SIP_405_METHOD_NOT_ALLOWED, GSM48_CC_CAUSE_SERV_OPT_UNAVAIL,"Service or Option Not Implemented" }, + { SIP_501_NOT_IMPLEMENTED, GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "Service or Option Not Implemented" }, + { SIP_415_UNSUPPORTED_MEDIA, GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "Service or Option Not Implemented" }, + { SIP_406_NOT_ACCEPTABLE, GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "Service or Option Not Implemented" }, + { SIP_482_LOOP_DETECTED, GSM48_CC_CAUSE_PRE_EMPTION, "Exchange Routing Error" }, + { SIP_483_TOO_MANY_HOPS, GSM48_CC_CAUSE_PRE_EMPTION, "Exchange Routing Error" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_BEARER_CA_UNAVAIL,"Bearer Capability Not Available" }, + { SIP_480_TEMPORARILY_UNAVAILABLE, GSM48_CC_CAUSE_NORMAL_UNSPEC, "Normal, Unspecified" } +}; + +static int status2cause(int status) +{ + uint8_t i; + + for (i = 0; i < ARRAY_SIZE(cause_map) - 1; i++) { + if (cause_map[i].sip_status == status) { + return cause_map[i].gsm48_cause; + } + } + return GSM48_CC_CAUSE_NORMAL_UNSPEC; +} + void nua_callback(nua_event_t event, int status, char const *phrase, nua_t *nua, nua_magic_t *magic, nua_handle_t *nh, nua_hmagic_t *hmagic, sip_t const *sip, tagi_t tags[]) { LOGP(DSIP, LOGL_DEBUG, "SIP event(%u) status(%d) phrase(%s) %p\n", @@ -217,6 +286,25 @@ } } +static void cause2status(int cause, int *sip_status, const char **sip_phrase, const char **reason_text) +{ + uint8_t i; + + for (i = 0; i < ARRAY_SIZE(cause_map) - 1; i++) { + if (cause_map[i].gsm48_cause == cause) { + *sip_status = cause_map[i].sip_status; + *sip_phrase = cause_map[i].sip_phrase; + *reason_text = cause_map[i].q850_reason; + LOGP(DSIP, LOGL_DEBUG, "%s(): Mapping cause(%d) to status(%d)\n", + __func__, cause, *sip_status); + return; + } + } + LOGP(DSIP, LOGL_DEBUG, "%s(): Cause(%d) not found in map.\n", __func__, cause); + *sip_status = cause_map[i].sip_status; + *sip_phrase = cause_map[i].sip_phrase; + *reason_text = cause_map[i].q850_reason; +} static void sip_release_call(struct call_leg *_leg) { -- To view, visit https://gerrit.osmocom.org/10727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 Gerrit-Change-Number: 10727 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:04:02 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:04:02 +0000 Subject: Change in osmo-sip-connector[master]: Implement Cause Mapping Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10728 Change subject: Implement Cause Mapping ...................................................................... Implement Cause Mapping Adds cause field to the call_leg and sip_call_leg structs. Translates the SIP status to MNCC cause and vice versa and uses this information in the SIP/MNCC messages at call leg release time. Change-Id: Ic1b80dff7e583cd6fff2b662bc6cc4bad3f81cd4 --- M src/call.h M src/mncc.c M src/sip.c 3 files changed, 24 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/28/10728/1 diff --git a/src/call.h b/src/call.h index 5a11f6c..eb9ef66 100644 --- a/src/call.h +++ b/src/call.h @@ -43,6 +43,7 @@ struct call *call; bool in_release; + int cause; /** * RTP data @@ -130,6 +131,7 @@ int rsp_wanted; struct mncc_connection *conn; + int cause; }; extern struct llist_head g_call_list; diff --git a/src/mncc.c b/src/mncc.c index 2ecf8d0..f41bb51 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -105,12 +105,16 @@ static void mncc_fill_header(struct gsm_mncc *mncc, uint32_t msg_type, uint32_t callref) { + struct mncc_call_leg *mncc_leg; + mncc->msg_type = msg_type; mncc->callref = callref; if (MNCC_DISC_REQ == msg_type || MNCC_REL_REQ == msg_type) { + mncc_leg = mncc_find_leg(callref); mncc->fields |= MNCC_F_CAUSE; mncc->cause.coding = GSM48_CAUSE_CODING_GSM; mncc->cause.location = GSM48_CAUSE_LOC_PUN_S_LU; + mncc->cause.value = mncc_leg->base.cause; } } @@ -511,6 +515,7 @@ other_leg = call_leg_other(&leg->base); if (other_leg) + other_leg->cause = data->cause.value; other_leg->release_call(other_leg); } @@ -529,6 +534,7 @@ struct call_leg *other_leg; other_leg = call_leg_other(&leg->base); if (other_leg) + other_leg->cause = data->cause.value; other_leg->release_call(other_leg); } LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was released.\n", data->callref); @@ -573,8 +579,10 @@ if (!leg) return; + leg->cause = data->cause.value; other_leg = call_leg_other(&leg->base); if (other_leg) + other_leg->cause = data->cause.value; other_leg->release_call(other_leg); LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected.\n", data->callref); mncc_leg_release(leg); diff --git a/src/sip.c b/src/sip.c index 7e456d9..088dbc3 100644 --- a/src/sip.c +++ b/src/sip.c @@ -244,8 +244,10 @@ nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); - if (other) + if (other) { + other->cause = status2cause(status); other->release_call(other); + } } } else if (event == nua_r_bye || event == nua_r_cancel) { /* our bye or hang up is answered */ @@ -300,7 +302,7 @@ return; } } - LOGP(DSIP, LOGL_DEBUG, "%s(): Cause(%d) not found in map.\n", __func__, cause); + LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%d) not found in map.\n", __func__, cause); *sip_status = cause_map[i].sip_status; *sip_phrase = cause_map[i].sip_phrase; *reason_text = cause_map[i].q850_reason; @@ -309,6 +311,10 @@ static void sip_release_call(struct call_leg *_leg) { struct sip_call_leg *leg; + char reason[64]; + int sip_cause; + const char *sip_phrase; + const char *reason_text; OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); leg = (struct sip_call_leg *) _leg; @@ -319,6 +325,10 @@ * and for a connected one bye. I don't see how sofia-sip is going * to help us here. */ + + cause2status(_leg->cause, &sip_cause, &sip_phrase, &reason_text); + snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text); + switch (leg->state) { case SIP_CC_INITIAL: LOGP(DSIP, LOGL_NOTICE, "Canceling leg(%p) in int state\n", leg); @@ -330,7 +340,8 @@ if (leg->dir == SIP_DIR_MT) nua_cancel(leg->nua_handle, TAG_END()); else { - nua_respond(leg->nua_handle, SIP_486_BUSY_HERE, + nua_respond(leg->nua_handle, sip_cause, sip_phrase, + SIPTAG_REASON_STR(reason), TAG_END()); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); -- To view, visit https://gerrit.osmocom.org/10728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1b80dff7e583cd6fff2b662bc6cc4bad3f81cd4 Gerrit-Change-Number: 10728 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:04:02 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:04:02 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add debug logging for status/causes Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10729 Change subject: Logging: Add debug logging for status/causes ...................................................................... Logging: Add debug logging for status/causes Adds some DEBUG level logging for SIP status and MNCC causes. Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 --- M src/mncc.c M src/sip.c 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/29/10729/1 diff --git a/src/mncc.c b/src/mncc.c index f41bb51..1a58823 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -264,7 +264,7 @@ case MNCC_CC_PROCEEDING: case MNCC_CC_CONNECTED: LOGP(DMNCC, LOGL_DEBUG, - "Releasing call in non-initial leg(%u)\n", leg->callref); + "Releasing call in non-initial leg(%u) cause(%d)\n", leg->callref, leg->base.cause); leg->base.in_release = true; start_cmd_timer(leg, MNCC_REL_IND); mncc_send(leg->conn, MNCC_DISC_REQ, leg->callref); @@ -507,6 +507,8 @@ if (!leg) return; + LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_DISC_IND, Cause: %d\n", data->cause.value); + LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was disconnected. Releasing\n", data->callref); leg->base.in_release = true; @@ -525,9 +527,12 @@ struct mncc_call_leg *leg; leg = find_leg(conn, buf, rc, &data); + if (!leg) return; + LOGP(DMNCC, LOGL_DEBUG, "Rcvd MNCC_REL_IND, Cause: %d\n", data->cause.value); + if (leg->base.in_release) stop_cmd_timer(leg, MNCC_REL_IND); else { @@ -584,7 +589,7 @@ if (other_leg) other_leg->cause = data->cause.value; other_leg->release_call(other_leg); - LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected.\n", data->callref); + LOGP(DMNCC, LOGL_DEBUG, "leg(%u) was rejected with cause(%d).\n", data->callref, leg->cause); mncc_leg_release(leg); } diff --git a/src/sip.c b/src/sip.c index 088dbc3..c9f5abb 100644 --- a/src/sip.c +++ b/src/sip.c @@ -239,12 +239,13 @@ else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); - LOGP(DSIP, LOGL_ERROR, "leg(%p) unknown err, releasing.\n", leg); + LOGP(DSIP, LOGL_ERROR, "leg(%p) unknown SIP status(%d), releasing.\n", leg, status); nua_cancel(leg->nua_handle, TAG_END()); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); if (other) { + LOGP(DSIP, LOGL_DEBUG, "Releasing other leg (%p) with status(%d)\n", other, status); other->cause = status2cause(status); other->release_call(other); } @@ -326,6 +327,7 @@ * to help us here. */ + LOGP(DSIP, LOGL_DEBUG, "%s(): Release with MNCC cause(%d)\n", __func__, _leg->cause); cause2status(_leg->cause, &sip_cause, &sip_phrase, &reason_text); snprintf(reason, sizeof reason, "Q.850;cause=%u;text=\"%s\"", _leg->cause, reason_text); -- To view, visit https://gerrit.osmocom.org/10729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:04:03 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:04:03 +0000 Subject: Change in osmo-sip-connector[master]: Cosmetic: correct spelling error in logging Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10730 Change subject: Cosmetic: correct spelling error in logging ...................................................................... Cosmetic: correct spelling error in logging Change-Id: I1f323a738f2c8ff21984b574a0ff47fe175e9161 --- M src/sip.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/30/10730/1 diff --git a/src/sip.c b/src/sip.c index c9f5abb..cf457ad 100644 --- a/src/sip.c +++ b/src/sip.c @@ -51,7 +51,7 @@ if (status == 183) sdp_extract_sdp(leg, sip, false); - LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now rining.\n", leg); + LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now ringing.\n", leg); other->ring_call(other); } -- To view, visit https://gerrit.osmocom.org/10730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1f323a738f2c8ff21984b574a0ff47fe175e9161 Gerrit-Change-Number: 10730 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:05:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vasil Velichkov) Date: Fri, 31 Aug 2018 14:05:19 +0000 Subject: Change in gr-gsm[master]: Format the output into ostringstream and then write it at once. Message-ID: Vasil Velichkov has uploaded this change for review. ( https://gerrit.osmocom.org/10731 Change subject: Format the output into ostringstream and then write it at once. ...................................................................... Format the output into ostringstream and then write it at once. This fixes the garbled output when multiple printers are used in a flowgraph. closes #255 closes #420 Change-Id: I1012ed26371b4c67163545652f0a1ce0f576af9e --- M lib/misc_utils/bursts_printer_impl.cc M lib/misc_utils/message_printer_impl.cc 2 files changed, 21 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/31/10731/1 diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc index c22e60b..ab9c319 100644 --- a/lib/misc_utils/bursts_printer_impl.cc +++ b/lib/misc_utils/bursts_printer_impl.cc @@ -66,48 +66,50 @@ return; } - std::cout << d_prepend_string; + std::ostringstream out; + out << d_prepend_string; if (d_prepend_fnr) { - std::cout << frame_nr; + out << frame_nr; } if (d_prepend_fnr && d_prepend_frame_count) { - std::cout << " "; + out << " "; } if (d_prepend_frame_count) { // calculate fn count using libosmogsm - std::cout << osmo_a5_fn_count(frame_nr); + out << osmo_a5_fn_count(frame_nr); } if (d_prepend_fnr || d_prepend_frame_count) { - std::cout << ": "; + out << ": "; } if (d_print_payload_only) { for (int ii=0; ii<57; ii++) { - std::cout << std::setprecision(1) << static_cast(burst[ii + 3]); + out << std::setprecision(1) << static_cast(burst[ii + 3]); } for (int ii=0; ii<57; ii++) { - std::cout << std::setprecision(1) << static_cast(burst[ii + 88]); + out << std::setprecision(1) << static_cast(burst[ii + 88]); } } else { for(int ii=0; ii(burst[ii]); + out << std::setprecision(1) << static_cast(burst[ii]); } } - std::cout << std::endl; + out << std::endl; + std::cout << out.str() << std::flush; } bool bursts_printer_impl::is_dummy_burst(int8_t *burst, size_t burst_len) diff --git a/lib/misc_utils/message_printer_impl.cc b/lib/misc_utils/message_printer_impl.cc index e8aa2d3..8342946 100644 --- a/lib/misc_utils/message_printer_impl.cc +++ b/lib/misc_utils/message_printer_impl.cc @@ -46,26 +46,27 @@ gsmtap_hdr * header = (gsmtap_hdr *)message_plus_header; uint32_t frame_nr = be32toh(header->frame_number); - std::cout << d_prepend_string; + std::ostringstream out; + out << d_prepend_string; if (d_prepend_fnr) { - std::cout << frame_nr; + out << frame_nr; } if (d_prepend_fnr && d_prepend_frame_count) { - std::cout << " "; + out << " "; } if (d_prepend_frame_count) { // calculate fn count using libosmogsm - std::cout << osmo_a5_fn_count(frame_nr); + out << osmo_a5_fn_count(frame_nr); } if (d_prepend_fnr || d_prepend_frame_count) { - std::cout << ": "; + out << ": "; } int start_index = sizeof(gsmtap_hdr); @@ -77,9 +78,11 @@ for(int ii=start_index; ii -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:12:32 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:12:32 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has abandoned this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 12 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pablo Neira Ayuso Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:19:56 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 31 Aug 2018 14:19:56 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10683 to look at the new patch set (#3). Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Allow to access imsi/ki from the OsmoMobile instances Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 --- M src/osmo_ms_driver/starter.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/83/10683/3 -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 31 Aug 2018 14:21:05 +0000 Subject: Change in osmo-gsm-tester[master]: Allow to access imsi/ki from the OsmoMobile instances In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10683 ) Change subject: Allow to access imsi/ki from the OsmoMobile instances ...................................................................... Allow to access imsi/ki from the OsmoMobile instances Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 --- M src/osmo_ms_driver/starter.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index bab468c..86ad446 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -73,6 +73,12 @@ self._ev_server_path = ev_server_path self._imsi, self._ki = next(self._imsi_ki_generator) + def imsi(self): + return self._imsi + + def ki(self): + return self._ki + def write_lua_cfg(self): lua_support = os.path.join(os.path.dirname(__file__), 'lua') cfg = { -- To view, visit https://gerrit.osmocom.org/10683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1b5f51e93d67e1dbde6f1ab4701e539d3cabec0 Gerrit-Change-Number: 10683 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 14:21:56 +0000 Subject: Change in osmo-trx[master]: radioInterfaceMulti:pullBuffer: Sanely convert float array to complex... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10720 ) Change subject: radioInterfaceMulti:pullBuffer: Sanely convert float array to complex array ...................................................................... Patch Set 1: Not yet, I wrote this batch of commits during my flight. -- To view, visit https://gerrit.osmocom.org/10720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibb2380a0a335ce798fe87221519fbbebade53054 Gerrit-Change-Number: 10720 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 31 Aug 2018 14:21:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:22:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 31 Aug 2018 14:22:05 +0000 Subject: Change in osmo-trx[master]: Vector: Copy arrays in a sane wayfor non-trivially copyable types In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10721 ) Change subject: Vector: Copy arrays in a sane wayfor non-trivially copyable types ...................................................................... Patch Set 1: Not yet, I wrote this batch of commits during my flight. -- To view, visit https://gerrit.osmocom.org/10721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c Gerrit-Change-Number: 10721 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 31 Aug 2018 14:22:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:22:37 +0000 Subject: Change in osmo-sip-connector[master]: Add SIP <-> MNCC Cause Map In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10727 to look at the new patch set (#2). Change subject: Add SIP <-> MNCC Cause Map ...................................................................... Add SIP <-> MNCC Cause Map Implements a cause_map, mapping the SIP status codes to GSM48_CC_CAUSE_* that are defined in libosmocore. The map at the same time implements the Q.850 cause texts that are subsequently used in the SIP Reason: header. Implements two functions cause2status() and status2cause() to read the map and return the the mapped status. The mapping mostly follows the implemention in the LCR program, so that any implementation relying on that mapping should continue to work as expected with osmo-sip-connector. Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 --- M src/sip.c 1 file changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/27/10727/2 -- To view, visit https://gerrit.osmocom.org/10727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 Gerrit-Change-Number: 10727 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:22:37 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add debug logging for status/causes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10729 to look at the new patch set (#2). Change subject: Logging: Add debug logging for status/causes ...................................................................... Logging: Add debug logging for status/causes Adds some DEBUG level logging for SIP status and MNCC causes. Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 --- M src/mncc.c M src/sip.c 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/29/10729/2 -- To view, visit https://gerrit.osmocom.org/10729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:22:37 +0000 Subject: Change in osmo-sip-connector[master]: Cosmetic: correct spelling error in logging In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10730 to look at the new patch set (#2). Change subject: Cosmetic: correct spelling error in logging ...................................................................... Cosmetic: correct spelling error in logging Change-Id: I1f323a738f2c8ff21984b574a0ff47fe175e9161 --- M src/sip.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/30/10730/2 -- To view, visit https://gerrit.osmocom.org/10730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1f323a738f2c8ff21984b574a0ff47fe175e9161 Gerrit-Change-Number: 10730 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:28:16 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 14:28:16 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add debug logging for status/causes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10729 to look at the new patch set (#3). Change subject: Logging: Add debug logging for status/causes ...................................................................... Logging: Add debug logging for status/causes Adds some DEBUG level logging for SIP status and MNCC causes. Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 --- M src/mncc.c M src/sip.c 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/29/10729/3 -- To view, visit https://gerrit.osmocom.org/10729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 14:57:46 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 31 Aug 2018 14:57:46 +0000 Subject: Change in osmo-gsm-tester[master]: Keep track of all mobiles and copy them to unstarted later In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10684 to look at the new patch set (#3). Change subject: Keep track of all mobiles and copy them to unstarted later ...................................................................... Keep track of all mobiles and copy them to unstarted later At all times have a list of mobiles that were created. Make a shallow copy and use it as the unstarted list. This will be used by the upcoming gsm tester integration to build a list of subscribers to be added into the HLR/AuC database. Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 --- M src/osmo_ms_driver/location_update_test.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/84/10684/3 -- To view, visit https://gerrit.osmocom.org/10684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id72b7ce8821cf53ac0d5e4a141b9a2b66242e2a3 Gerrit-Change-Number: 10684 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Aug 31 15:13:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 31 Aug 2018 15:13:54 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#232?= In-Reply-To: <1211917326.77.1535641806838.JavaMail.jenkins@jenkins.osmocom.org> References: <1211917326.77.1535641806838.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1288212605.89.1535728434902.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:13:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:13:45 +0000 Subject: Change in osmo-sip-connector[master]: Add SIP <-> MNCC Cause Map In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10727 ) Change subject: Add SIP <-> MNCC Cause Map ...................................................................... Patch Set 2: Code-Review+2 as we don't have any comprehensive mapping currently at all, the patch is definitely a big improvement. One could of course always argue about detailed mappings, but I think there's no reason not to merge this patch right now. -- To view, visit https://gerrit.osmocom.org/10727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 Gerrit-Change-Number: 10727 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 16:13:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:17:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:17:33 +0000 Subject: Change in osmo-sip-connector[master]: Implement Cause Mapping In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10728 ) Change subject: Implement Cause Mapping ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/10728/2/src/call.h File src/call.h: https://gerrit.osmocom.org/#/c/10728/2/src/call.h at 46 PS2, Line 46: int cause; as this is just an integer number, and there's no reference to an enum or any type, or a comment, it's hard to know what kind of number range / type / ... is used here. I would appreciate at least a comment pointing to the relevant table/spec/header/... https://gerrit.osmocom.org/#/c/10728/2/src/call.h at 134 PS2, Line 134: cause same here. -- To view, visit https://gerrit.osmocom.org/10728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic1b80dff7e583cd6fff2b662bc6cc4bad3f81cd4 Gerrit-Change-Number: 10728 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 16:17:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:19:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:19:23 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add debug logging for status/causes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10729 ) Change subject: Logging: Add debug logging for status/causes ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10729/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/10729/3/src/mncc.c at 267 PS3, Line 267: (%d) might be nice to have some value_string array to stringify the cause value. If it's a MNCC cause, then I think regular 04.08 cause values are used here? -- To view, visit https://gerrit.osmocom.org/10729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 31 Aug 2018 16:19:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:26:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:26:56 +0000 Subject: Change in osmo-sip-connector[master]: Cosmetic: correct spelling error in logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10730 ) Change subject: Cosmetic: correct spelling error in logging ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f323a738f2c8ff21984b574a0ff47fe175e9161 Gerrit-Change-Number: 10730 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 16:26:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:27:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:27:49 +0000 Subject: Change in osmo-trx[master]: configure.ac: Add --enable-werror option In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10716 ) Change subject: configure.ac: Add --enable-werror option ...................................................................... configure.ac: Add --enable-werror option Change-Id: Ib2782aecd400398bf36427f255c2a427ef781e06 --- M configure.ac 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Stefan Sperling: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index cc099d2..e1cc121 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,25 @@ LDFLAGS="$LDFLAGS -fsanitize=address -fsanitize=undefined" fi +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + + AC_ARG_WITH(uhd, [ AS_HELP_STRING([--with-uhd], [enable UHD based transceiver]) -- To view, visit https://gerrit.osmocom.org/10716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib2782aecd400398bf36427f255c2a427ef781e06 Gerrit-Change-Number: 10716 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:31:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:31:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: check paging channel fn (bs_ag_blks_res) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10726 ) Change subject: BTS_Tests: check paging channel fn (bs_ag_blks_res) ...................................................................... Patch Set 2: Code-Review+2 It's a bit of a philosophy question. I typically try to not test too many things in one patch. For example, if the patch is about testing paging load reporting, then that test should only test whatever is required in that context, and not verify if paging blocks are send on AGCH, as that's "out of scope". It's sometimes difficult to draw the line, and this is not a strict rule. I'm just explaining my rationale why I didn't add such checks before. But we can merge this one. Just in the future, keep it in mind that it's typically better to have more specific test cases rather than single test cases that test tons of thing in one. -- To view, visit https://gerrit.osmocom.org/10726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2 Gerrit-Change-Number: 10726 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 16:31:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:31:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:31:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: improve connection failure message in IPA emulation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/10725 ) Change subject: improve connection failure message in IPA emulation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I828fe67d66bcd668aa14922b89a2feac56dc2d9a Gerrit-Change-Number: 10725 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 31 Aug 2018 16:31:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:31:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 31 Aug 2018 16:31:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: improve connection failure message in IPA emulation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10725 ) Change subject: improve connection failure message in IPA emulation ...................................................................... improve connection failure message in IPA emulation Show addresses and ports which were attempted in the IPA connection failure message. Example output: Verdict: fail reason: Could not connect IPA socket from "" port -1 \ to "127.0.0.1" port 4238; check your configuration Change-Id: I828fe67d66bcd668aa14922b89a2feac56dc2d9a --- M library/IPA_Emulation.ttcnpp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 5c385e6..7a26a6b 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -208,7 +208,8 @@ res := IPA_CodecPort_CtrlFunct.f_IPL4_connect(IPA_PORT, remote_host, remote_port, local_host, local_port, 0, { tcp:={} }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect IPA socket, check your configuration"); + setverdict(fail, "Could not connect IPA socket from ", local_host, " port ", local_port, + " to ", remote_host, " port ", remote_port, "; check your configuration"); mtc.stop; } g_ipa_conn_id := res.connId; -- To view, visit https://gerrit.osmocom.org/10725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I828fe67d66bcd668aa14922b89a2feac56dc2d9a Gerrit-Change-Number: 10725 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:54:00 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 16:54:00 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add debug logging for status/causes In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10729 ) Change subject: Logging: Add debug logging for status/causes ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/10729/3/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/10729/3/src/mncc.c at 267 PS3, Line 267: (%d) > might be nice to have some value_string array to stringify the cause value. [?] That's true + I thought about doing that. Requires adding that value string array and associated osmo_mncc_cause_string() or some such to libosmocore, correct? -- To view, visit https://gerrit.osmocom.org/10729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 31 Aug 2018 16:54:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:57:59 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 16:57:59 +0000 Subject: Change in osmo-sip-connector[master]: Add SIP <-> MNCC Cause Map In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10727 ) Change subject: Add SIP <-> MNCC Cause Map ...................................................................... Patch Set 2: One could of course always > argue about detailed mappings, Yes, I thought about it, and I grep'd the legacy libmsc and osmo-msc code for which GSM_CC_CAUSE we may actually send, it is a quite limited subset of what appears here, All the same, We never know what a SIP UA might send at some point and at least then the map is here for people to add to or modify according to needs that are discovered. -- To view, visit https://gerrit.osmocom.org/10727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 Gerrit-Change-Number: 10727 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Fri, 31 Aug 2018 16:57:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 16:58:03 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 16:58:03 +0000 Subject: Change in osmo-sip-connector[master]: Add SIP <-> MNCC Cause Map In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10727 ) Change subject: Add SIP <-> MNCC Cause Map ...................................................................... Add SIP <-> MNCC Cause Map Implements a cause_map, mapping the SIP status codes to GSM48_CC_CAUSE_* that are defined in libosmocore. The map at the same time implements the Q.850 cause texts that are subsequently used in the SIP Reason: header. Implements two functions cause2status() and status2cause() to read the map and return the the mapped status. The mapping mostly follows the implemention in the LCR program, so that any implementation relying on that mapping should continue to work as expected with osmo-sip-connector. Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 --- M src/sip.c 1 file changed, 88 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/sip.c b/src/sip.c index 84d1f6e..07d2286 100644 --- a/src/sip.c +++ b/src/sip.c @@ -148,6 +148,75 @@ talloc_strdup(leg, to)); } +/* Sofia SIP definitions come with error code numbers and strings, this + * map allows us to reuse the existing definitions. + * The map is in priority order. The first matching entry found + * will be used. + */ + +static struct cause_map { + int sip_status; + const char *sip_phrase; + int gsm48_cause; + const char *q850_reason; +} cause_map[] = { + { SIP_200_OK, GSM48_CC_CAUSE_NORM_CALL_CLEAR, "Normal Call Clearing" }, + { SIP_403_FORBIDDEN, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_401_UNAUTHORIZED, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_402_PAYMENT_REQUIRED, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_407_PROXY_AUTH_REQUIRED, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_603_DECLINE, GSM48_CC_CAUSE_CALL_REJECTED, "Call Rejected" }, + { SIP_406_NOT_ACCEPTABLE, GSM48_CC_CAUSE_CHAN_UNACCEPT, "Channel Unacceptable" }, + { SIP_404_NOT_FOUND, GSM48_CC_CAUSE_UNASSIGNED_NR, "Unallocated Number" }, + { SIP_485_AMBIGUOUS, GSM48_CC_CAUSE_NO_ROUTE, "No Route to Destination" }, + { SIP_604_DOES_NOT_EXIST_ANYWHERE, GSM48_CC_CAUSE_NO_ROUTE, "No Route to Destination" }, + { SIP_504_GATEWAY_TIME_OUT, GSM48_CC_CAUSE_RECOVERY_TIMER, "Recovery on Timer Expiry" }, + { SIP_408_REQUEST_TIMEOUT, GSM48_CC_CAUSE_RECOVERY_TIMER, "Recovery on Timer Expiry" }, + { SIP_410_GONE, GSM48_CC_CAUSE_NUMBER_CHANGED, "Number Changed" }, + { SIP_416_UNSUPPORTED_URI, GSM48_CC_CAUSE_INVAL_TRANS_ID, "Invalid Call Reference Value" }, + { SIP_420_BAD_EXTENSION, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_414_REQUEST_URI_TOO_LONG, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_413_REQUEST_TOO_LARGE, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_421_EXTENSION_REQUIRED, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_423_INTERVAL_TOO_BRIEF, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_505_VERSION_NOT_SUPPORTED, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_513_MESSAGE_TOO_LARGE, GSM48_CC_CAUSE_INTERWORKING, "Interworking, Unspecified" }, + { SIP_480_TEMPORARILY_UNAVAILABLE, GSM48_CC_CAUSE_USER_NOTRESPOND, "No User Responding" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_RESOURCE_UNAVAIL,"Resource Unavailable, Unspecified" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_SWITCH_CONG, "Switching Equipment Congestion" }, + { SIP_400_BAD_REQUEST, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_481_NO_CALL, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_500_INTERNAL_SERVER_ERROR, GSM48_CC_CAUSE_TEMP_FAILURE, "Temporary Failure" }, + { SIP_486_BUSY_HERE, GSM48_CC_CAUSE_USER_BUSY, "User Busy" }, + { SIP_600_BUSY_EVERYWHERE, GSM48_CC_CAUSE_USER_BUSY, "User Busy" }, + { SIP_484_ADDRESS_INCOMPLETE, GSM48_CC_CAUSE_INV_NR_FORMAT, "Invalid Number Format (addr incomplete)" }, + { SIP_488_NOT_ACCEPTABLE, GSM48_CC_CAUSE_INCOMPAT_DEST, "Incompatible Destination" }, + { SIP_606_NOT_ACCEPTABLE, GSM48_CC_CAUSE_INCOMPAT_DEST, "Incompatible Destination" }, + { SIP_502_BAD_GATEWAY, GSM48_CC_CAUSE_DEST_OOO, "Destination Out of Order" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_NETWORK_OOO, "Network Out of Order" }, + { SIP_405_METHOD_NOT_ALLOWED, GSM48_CC_CAUSE_SERV_OPT_UNAVAIL,"Service or Option Not Implemented" }, + { SIP_501_NOT_IMPLEMENTED, GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "Service or Option Not Implemented" }, + { SIP_415_UNSUPPORTED_MEDIA, GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "Service or Option Not Implemented" }, + { SIP_406_NOT_ACCEPTABLE, GSM48_CC_CAUSE_SERV_OPT_UNIMPL, "Service or Option Not Implemented" }, + { SIP_482_LOOP_DETECTED, GSM48_CC_CAUSE_PRE_EMPTION, "Exchange Routing Error" }, + { SIP_483_TOO_MANY_HOPS, GSM48_CC_CAUSE_PRE_EMPTION, "Exchange Routing Error" }, + { SIP_503_SERVICE_UNAVAILABLE, GSM48_CC_CAUSE_BEARER_CA_UNAVAIL,"Bearer Capability Not Available" }, + { SIP_480_TEMPORARILY_UNAVAILABLE, GSM48_CC_CAUSE_NORMAL_UNSPEC, "Normal, Unspecified" } +}; + +static int status2cause(int status) +{ + uint8_t i; + + for (i = 0; i < ARRAY_SIZE(cause_map) - 1; i++) { + if (cause_map[i].sip_status == status) { + return cause_map[i].gsm48_cause; + } + } + return GSM48_CC_CAUSE_NORMAL_UNSPEC; +} + void nua_callback(nua_event_t event, int status, char const *phrase, nua_t *nua, nua_magic_t *magic, nua_handle_t *nh, nua_hmagic_t *hmagic, sip_t const *sip, tagi_t tags[]) { LOGP(DSIP, LOGL_DEBUG, "SIP event(%u) status(%d) phrase(%s) %p\n", @@ -217,6 +286,25 @@ } } +static void cause2status(int cause, int *sip_status, const char **sip_phrase, const char **reason_text) +{ + uint8_t i; + + for (i = 0; i < ARRAY_SIZE(cause_map) - 1; i++) { + if (cause_map[i].gsm48_cause == cause) { + *sip_status = cause_map[i].sip_status; + *sip_phrase = cause_map[i].sip_phrase; + *reason_text = cause_map[i].q850_reason; + LOGP(DSIP, LOGL_DEBUG, "%s(): Mapping cause(%d) to status(%d)\n", + __func__, cause, *sip_status); + return; + } + } + LOGP(DSIP, LOGL_ERROR, "%s(): Cause(%d) not found in map.\n", __func__, cause); + *sip_status = cause_map[i].sip_status; + *sip_phrase = cause_map[i].sip_phrase; + *reason_text = cause_map[i].q850_reason; +} static void sip_release_call(struct call_leg *_leg) { -- To view, visit https://gerrit.osmocom.org/10727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id82be8603a30a6aec28fc0258236c1746973db58 Gerrit-Change-Number: 10727 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 17:11:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 31 Aug 2018 17:11:37 +0000 Subject: Change in osmo-sip-connector[master]: Implement Cause Mapping In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10728 ) Change subject: Implement Cause Mapping ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/10728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic1b80dff7e583cd6fff2b662bc6cc4bad3f81cd4 Gerrit-Change-Number: 10728 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 31 Aug 2018 17:11:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 17:12:17 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 17:12:17 +0000 Subject: Change in osmo-sip-connector[master]: Implement Cause Mapping In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, Holger Freyther, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10728 to look at the new patch set (#3). Change subject: Implement Cause Mapping ...................................................................... Implement Cause Mapping Adds cause field to the call_leg and sip_call_leg structs. Translates the SIP status to MNCC cause and vice versa and uses this information in the SIP/MNCC messages at call leg release time. Change-Id: Ic1b80dff7e583cd6fff2b662bc6cc4bad3f81cd4 --- M src/call.h M src/mncc.c M src/sip.c 3 files changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/28/10728/3 -- To view, visit https://gerrit.osmocom.org/10728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic1b80dff7e583cd6fff2b662bc6cc4bad3f81cd4 Gerrit-Change-Number: 10728 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 18:10:38 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 18:10:38 +0000 Subject: Change in libosmocore[master]: Add CC_CAUSE value_string array Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/10732 Change subject: Add CC_CAUSE value_string array ...................................................................... Add CC_CAUSE value_string array Adds a value_string array for GSM 04.08 Call Control cause values Change-Id: I296f208581ce2550805f9d96e20f7319e1199023 --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 59 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/10732/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 4635014..e218295 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1495,6 +1495,10 @@ GSM48_CC_CAUSE_INTERWORKING = 127, }; +extern const struct value_string gsm48_cc_cause_names[]; +static inline const char *gsm48_cc_cause_name(enum gsm48_cc_cause val) +{ return get_value_string(gsm48_cc_cause_names, val); } + /* Annex G, GSM specific cause values for mobility management */ enum gsm48_reject_value { GSM48_REJECT_IMSI_UNKNOWN_IN_HLR = 2, diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index 136b937..18dff39 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -945,6 +945,60 @@ { 0, NULL } }; +/*! TS 04.08 10.5..4.11 Call Control Cause Values */ +const struct value_string gsm48_cc_cause_names[] = { + OSMO_VALUE_STRING(GSM48_CC_CAUSE_UNASSIGNED_NR), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_NO_ROUTE), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_CHAN_UNACCEPT), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_OP_DET_BARRING), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_NORM_CALL_CLEAR), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_USER_BUSY), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_USER_NOTRESPOND), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_USER_ALERTING_NA), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_CALL_REJECTED), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_NUMBER_CHANGED), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_PRE_EMPTION), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_NONSE_USER_CLR), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_DEST_OOO), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_INV_NR_FORMAT), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_FACILITY_REJ), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_RESP_STATUS_INQ), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_NORMAL_UNSPEC), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_NO_CIRCUIT_CHAN), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_NETWORK_OOO), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_TEMP_FAILURE), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_SWITCH_CONG), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_ACC_INF_DISCARD), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_REQ_CHAN_UNAVAIL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_RESOURCE_UNAVAIL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_QOS_UNAVAIL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_REQ_FAC_NOT_SUBSC), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_INC_BARRED_CUG), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_BEARER_CAP_UNAUTH), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_BEARER_CA_UNAVAIL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_SERV_OPT_UNAVAIL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_BEARERSERV_UNIMPL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_ACM_GE_ACM_MAX), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_REQ_FAC_NOTIMPL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_RESTR_BCAP_AVAIL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_SERV_OPT_UNIMPL), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_INVAL_TRANS_ID), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_USER_NOT_IN_CUG), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_INCOMPAT_DEST), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_INVAL_TRANS_NET), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_SEMANTIC_INCORR), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_INVAL_MAND_INF), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_MSGTYPE_NOTEXIST), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_MSGTYPE_INCOMPAT), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_IE_NOTEXIST), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_COND_IE_ERR), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_MSG_INCOMP_STATE), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_RECOVERY_TIMER), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_PROTO_ERR), + OSMO_VALUE_STRING(GSM48_CC_CAUSE_INTERWORKING), + { 0 , NULL } +}; + /*! TS 04.80, section 3.4 Messages for supplementary services control */ const struct value_string gsm48_nc_ss_msgtype_names[] = { OSMO_VALUE_STRING(GSM0480_MTYPE_RELEASE_COMPLETE), diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 1da398c..60d6ed8 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -321,6 +321,7 @@ gsm48_rr_msgtype_names; gsm48_mm_msgtype_names; gsm48_cc_msgtype_names; +gsm48_cc_cause_names; gsm48_pdisc_msgtype_name; gsm48_reject_value_names; -- To view, visit https://gerrit.osmocom.org/10732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I296f208581ce2550805f9d96e20f7319e1199023 Gerrit-Change-Number: 10732 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 18:14:31 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 18:14:31 +0000 Subject: Change in libosmocore[master]: Add CC_CAUSE value_string array In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10732 ) Change subject: Add CC_CAUSE value_string array ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/10732/1/src/gsm/gsm48.c File src/gsm/gsm48.c: https://gerrit.osmocom.org/#/c/10732/1/src/gsm/gsm48.c at 950 PS1, Line 950: OSMO_VALUE_STRING(GSM48_CC_CAUSE_UNASSIGNED_NR), ?? This might be nicer to have as a shorter string array in the style of (for example) gsm48_pdisc_names[] above ?? Basically taking off 'GSM48_CC_CAUSE' ? -- To view, visit https://gerrit.osmocom.org/10732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I296f208581ce2550805f9d96e20f7319e1199023 Gerrit-Change-Number: 10732 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Fri, 31 Aug 2018 18:14:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Aug 31 18:17:02 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 31 Aug 2018 18:17:02 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add debug logging for status/causes In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/10729 ) Change subject: Logging: Add debug logging for status/causes ...................................................................... Patch Set 4: Added to libosmocore is gerrit #10732 -- To view, visit https://gerrit.osmocom.org/10729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib56e34ba079c7927e932c1b29d3e8341b8099ae0 Gerrit-Change-Number: 10729 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 31 Aug 2018 18:17:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: